Skip to content

Instantly share code, notes, and snippets.

@mfyance

mfyance/git.merge

Last active April 27, 2018 03:15
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 mfyance/2f9184e56e15eac8199dbcd3adbceb96 to your computer and use it in GitHub Desktop.
Save mfyance/2f9184e56e15eac8199dbcd3adbceb96 to your computer and use it in GitHub Desktop.
Download ZIP
Winmerge Git
Raw
git.merge
[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