Created
August 20, 2015 04:27
-
-
Save taisyo7333/84b4b8ea4428bfe1e416 to your computer and use it in GitHub Desktop.
SourceTree / git で WinMerge を diff , mergeに使いたい。
This file contains hidden or 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/WinMerge/WinMergeU.exe\" //e //u //wl //wr \"$LOCAL\" \"$BASE\" \"$REMOTE\" //o \"$MERGED\" | |
| trustExitCode = true | |
| [diff] | |
| guitool = winmerge | |
| [difftool "winmerge"] | |
| path = C:/Program Files/WinMerge/winmergeu.exe | |
| cmd = \"C:/Program Files/WinMerge/winmergeu.exe\" -e -u \"$LOCAL\" \"$REMOTE\" |
Author
taisyo7333
commented
Aug 20, 2015
Windows でSourceTreeについてくるgitを利用している場合
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment