TortoiseSVN设置WinMerge或Beyond Compare

最新推荐文章于 2022-01-11 19:38:55 发布

dongzhiquan

最新推荐文章于 2022-01-11 19:38:55 发布

阅读量4.4k

点赞数

分类专栏： SVN 软件 Beyond Compare 文章标签： tortoisesvn merge command properties extension image

本文链接：https://blog.csdn.net/dongzhiquan/article/details/6252081

版权

软件同时被 3 个专栏收录

29 篇文章 0 订阅

订阅专栏

SVN

4 篇文章 0 订阅

订阅专栏

Beyond Compare

1 篇文章 0 订阅

订阅专栏

WinMerge:C:/Program Files/WinMerge/WinMergeU.exe -e -ub -dl %bname -dr %yname %base %mine

Beyond Compare 3：C:/Program Files/Beyond Compare 3/BComp.exe %mine %base

Diff Viewer

"C:/Program Files (x86)/Beyond Compare 3/BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

Put the SAME THING for both “comparing different revisions of files” and “comparing different revisions of properties”.
Merge Tool

"C:/Program Files (x86)/Beyond Compare 3/BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

TortoiseSVN

Diff

   1. Select Settings from Explorer's TortoiseSVN submenu.
   2. Switch to the Diff Viewer tab.
   3. Change the radio buttons from TortoiseMerge to External.
   4. In the path edits, enter:
      "C:/Program Files/Beyond Compare 3/BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

To use Beyond Compare for image comparisons either replace the file C:/Program Files/TortoiseSVN/bin/TortoiseIDiff.exe with a copy of BComp.exe, or click the Advanced button on the Diff Viewer tab and add each image type's extension with the same command line as above.

3-way Merge (v3 Pro)

   1. Select Settings from Explorer's TortoisSVN submenu.
   2. Switch to the Merge Tool tab.
   3. Change the radio buttons from TortoiseMerge to External.
   4. In the path edits, enter:
      "C:/Program Files/Beyond Compare 3/BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

2-way Merge (v3 Std, v2)
Use the same steps as above, but use the command line:
"C:/Program Files/Beyond Compare 3/BComp.exe" %mine %theirs /savetarget=%merged