Skip to content

Instantly share code, notes, and snippets.

@jayeshcp
Created November 9, 2016 14:07
Show Gist options
  • Save jayeshcp/29128c5841fd14b6464241fd42598e9a to your computer and use it in GitHub Desktop.
Save jayeshcp/29128c5841fd14b6464241fd42598e9a to your computer and use it in GitHub Desktop.
Using WinMerge as Git Diff/Merge tool
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "C:/Program Files (x86)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "C:/Program Files (x86)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment