devlights
4/8/2015 - 2:38 AM

SVNでWinMergeの設定 (DiffTool, MergeTool)

SVNでWinMergeの設定 (DiffTool, MergeTool)

svn-winmerge.md
content_copyfile_download
  • Rendered
  • Source
  • difftool
    • C:\Program Files\WinMerge\WinMergeU.exe -e -ub -dl %bname -dr %yname %base %mine
  • mergetool
    • C:\Program Files\WinMerge\WinMergeU.exe -e -x -ub -wl -dl "■編集不可:相手 %tname■" %theirs -dm %mname %merged -wr -dr "■編集不可:自分 %yname■" %mine