Skip to content

Instantly share code, notes, and snippets.

@pamtrak06

pamtrak06/git-winmerge-win.sh

Created November 11, 2018 17:56
Show Gist options
  • Save pamtrak06/86f44259e0b01fa4d4dacf8bcbc29eac to your computer and use it in GitHub Desktop.
Save pamtrak06/86f44259e0b01fa4d4dacf8bcbc29eac to your computer and use it in GitHub Desktop.
Download ZIP
Configure git to include winmerge - windows
Raw
git-winmerge-win.sh
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e $LOCAL $REMOTE
[merge]
tool = winmerge
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "/c/Program\\ Files\\ \\(x86\\)/WinMerge/WinMergeU.exe" -u -e -dl \"Local\" -dr \"Remote\" $LOCAL $REMOTE $MERGED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment