Skip to content

Instantly share code, notes, and snippets.

@aortmannm
Created May 14, 2014 15:43
Show Gist options
  • Save aortmannm/8635a279b9fe9141975b to your computer and use it in GitHub Desktop.
Save aortmannm/8635a279b9fe9141975b to your computer and use it in GitHub Desktop.
gitconfig to use winmerge as mergetool
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/development/dev-tools/WinMerge-2.14.0-exe/winmergeu.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/development/dev-tools/WinMerge-2.14.0-exe/winmergeu.exe" -u -e $LOCAL $REMOTE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment