Created
April 27, 2018 03:14
-
-
Save mfyance/127712e4da3b0bdcc5a0479aedf8de17 to your computer and use it in GitHub Desktop.
Winmerge Git
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[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