Skip to content

Instantly share code, notes, and snippets.

@stobys
Forked from shawndumas/.gitconfig
Created April 25, 2017 15:47
Show Gist options
  • Save stobys/73ef648f2e8c437d90e8399008a0165c to your computer and use it in GitHub Desktop.
Save stobys/73ef648f2e8c437d90e8399008a0165c to your computer and use it in GitHub Desktop.
Using WinMerge as the git Diff/Merge Tool on Windows 64bit
[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