Created
January 24, 2016 23:42
-
-
Save krishnabhargav/0592e884df5c6103f739 to your computer and use it in GitHub Desktop.
For Windows : Git config commands to set up DiffMerge as default GIT tool.
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
| git config --global diff.tool diffmerge | |
| git config --global difftool.diffmerge.cmd 'c:/tools/diffmerge/sgdm.exe \"$LOCAL\" \"$REMOTE\"' | |
| git config --global merge.tool diffmerge | |
| git config --global mergetool.diffmerge.cmd 'c:/tools/diffmerge/sgdm.exe --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"' | |
| git config --global mergetool.diffmerge.trustExitCode true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment