Created
October 25, 2012 10:02
-
-
Save TakashiSasaki/3951766 to your computer and use it in GitHub Desktop.
Using WinMerge as a mergetool of 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
# This file obsoletes http://pastebin.com/DUTrrYdv | |
[merge] | |
tool = WinMerge | |
[mergetool "WinMerge"] | |
path = C:/Program Files (x86)/WinMerge/WinMergeU.exe | |
cmd = \"C:/Program Files (x86)/WinMerge/WinMergeU.exe\" -dl \"$LOCAL\" -dm \"$BASE\" -dr \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -o \"$MERGED\" | |
[diff] | |
tool = WinMerge | |
guitool = WinMerge | |
[difftool "WinMerge"] | |
path = C:/Program Files (x86)/WinMerge/WinMergeU.exe | |
cmd = \"C:/Program Files (x86)/WinMerge/WinMergeU.exe\" -e -ub -dl Base -dr \"$REMOTE\" \"$LOCAL\" \"$REMOTE\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment