Created
January 6, 2018 02:17
-
-
Save shelaf/8d27012aa6a9623063f52336d9b4319c to your computer and use it in GitHub Desktop.
TortoiseSVN/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
| 差分 | |
| WinMergeU.exe /e /ub /wl /wr /dl %bname /dr %yname "%base" "%mine%" | |
| マージ | |
| WinMergeU.exe /e /ub /wl /wr /dl %yname "%mine" /dm %mname "%merged" /dr %tname "%theirs" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment