TortoiseSVN设置Beyond Compare

最新推荐文章于 2024-08-20 11:28:21 发布

辧聪

最新推荐文章于 2024-08-20 11:28:21 发布

阅读量1.3k

点赞数

分类专栏： C，java，C++笔记

C，java，C++笔记专栏收录该内容

10 篇文章

订阅专栏

本文介绍了如何在TortoiseGit和TortoiseSVN中配置BeyondCompare作为默认的差异比较和合并工具，包括两方及三方合并的具体设置步骤。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

 TORTOISEGIT Diff
 Launch TortoiseGit | Settings
 Switch to the Diff Viewer section under External Programs
 Change the radio buttons from TortoiseMerge to External.
 In the path edits, enter:
 "C:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly
 3-way Merge (v3 Pro)
 Launch TortoiseGit | Settings
 Switch to the Merge Tool section under External Programs
 Change the radio buttons from TortoiseMerge to External.
 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
 TORTOISESVN Diff
 Select Settings from Explorer's TortoiseSVN submenu.
 Switch to the Diff Viewer tab.
 Change the radio buttons from TortoiseMerge to External.
 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 theDiff Viewer tab and add each image type's extension with the same command line as above.
 3-way Merge (v3 Pro)
 Select Settings from Explorer's TortoisSVN submenu.
 Switch to the Merge Tool tab.
 Change the radio buttons from TortoiseMerge to External.
 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