Created
April 29, 2015 22:56
-
-
Save renaco/74bbbb9dfaf1c3492ff0 to your computer and use it in GitHub Desktop.
Set Winmege for Mergetool on Windows
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