Skip to content

Instantly share code, notes, and snippets.

@EEParker
Forked from shawndumas/.gitconfig
Last active August 15, 2017 15:48
Show Gist options
  • Save EEParker/3aa5340c2d77a9a11070dbd85b3212f5 to your computer and use it in GitHub Desktop.
Save EEParker/3aa5340c2d77a9a11070dbd85b3212f5 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