Skip to content

Instantly share code, notes, and snippets.

@krishnabhargav

krishnabhargav/DiffMerge as Default GIT tool

Created January 24, 2016 23:42
Show Gist options
  • Save krishnabhargav/0592e884df5c6103f739 to your computer and use it in GitHub Desktop.
Save krishnabhargav/0592e884df5c6103f739 to your computer and use it in GitHub Desktop.
Download ZIP
For Windows : Git config commands to set up DiffMerge as default GIT tool.
Raw
DiffMerge as Default GIT tool
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