Skip to content

Instantly share code, notes, and snippets.

@christopherliu

christopherliu/.gitconfig

Forked from shawndumas/.gitconfig
Last active August 12, 2020 20:41
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 christopherliu/ee9d55fe744c2c2d2830148ef0002f23 to your computer and use it in GitHub Desktop.
Save christopherliu/ee9d55fe744c2c2d2830148ef0002f23 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 -wl -wr $LOCAL $BASE $REMOTE -o $MERGED
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE
@christopherliu
Copy link
Author

This version is modified to put local/base/remote in the proper order. See also this illustration of how vimdiff does it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment