Skip to content

Instantly share code, notes, and snippets.

@renaco

renaco/gist:74bbbb9dfaf1c3492ff0

Created April 29, 2015 22:56
Show Gist options
  • Save renaco/74bbbb9dfaf1c3492ff0 to your computer and use it in GitHub Desktop.
Save renaco/74bbbb9dfaf1c3492ff0 to your computer and use it in GitHub Desktop.
Download ZIP
Set Winmege for Mergetool on Windows
Raw
gistfile1.txt
[merge]
tool = winmerge
[mergetool "winmerge"]
cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe\" "$PWD/$LOCAL" "$PWD/$REMOTE" "$PWD/$MERGED"
trustExitCode = false
keepBackup = false
[diff]
tool = winmerge
[difftool "winmerge"]
cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe\" "$PWD/$LOCAL" "$PWD/$REMOTE" "$PWD/$MERGED"
trustExitCode = false
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment