Skip to content

Instantly share code, notes, and snippets.

@shelaf

shelaf/gist:8d27012aa6a9623063f52336d9b4319c

Created January 6, 2018 02:17
Show Gist options
  • Save shelaf/8d27012aa6a9623063f52336d9b4319c to your computer and use it in GitHub Desktop.
Save shelaf/8d27012aa6a9623063f52336d9b4319c to your computer and use it in GitHub Desktop.
Download ZIP
TortoiseSVN/Git用差分・マージ設定
Raw
gistfile1.txt
差分
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