Skip to content

Instantly share code, notes, and snippets.

@jcspader

jcspader/.gitconfig

Forked from shawndumas/.gitconfig
Last active August 29, 2015 14:26
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jcspader/bb3345016d9b2056ec91 to your computer and use it in GitHub Desktop.
Save jcspader/bb3345016d9b2056ec91 to your computer and use it in GitHub Desktop.
Download ZIP
Using WinMerge as the git Diff/Merge Tool on Windows 64bit
Raw
.gitconfig
[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