Skip to content

Instantly share code, notes, and snippets.

@naturalkei
Forked from shawndumas/.gitconfig
Created July 19, 2021 01:05
Show Gist options
  • Save naturalkei/73f0b8eee7bb66072bbf79b6b8aad20e to your computer and use it in GitHub Desktop.
Save naturalkei/73f0b8eee7bb66072bbf79b6b8aad20e 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