Cheryl MacDonald cherylaimee
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <div class="drop-shadow">Drop shadow</div> | |
| <div class="raised">Raised</div> | |
| <div class="depressed">Depressed</div> | |
| <div class="outline">Outline</div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [core] | |
| autocrlf = true | |
| [merge] | |
| tool = p4mergetool | |
| [mergetool "p4mergetool"] | |
| cmd = p4merge.exe $BASE $REMOTE $LOCAL $MERGED | |
| trustExitCode = false | |
| [mergetool] | |
| keepBackup = false | |
| [color] |