Created
August 8, 2014 17:08
-
-
Save AliceWaddicor/9cdeb7051fd9b77fe1f9 to your computer and use it in GitHub Desktop.
This file contains 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
| git config --global merge.tool semanticmerge | |
| git config --global mergetool.semanticmerge.cmd "C:/Users/Alice/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe -d \"$LOCAL\" -s \"$REMOTE\" -b \"$BASE\" -r \"$MERGED\"" | |
| git config --global mergetool.semanticmerge.trustExitCode true | |
| git config --global mergetool.prompt false | |
| git config --global mergetool.keepBackup false |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment