TortoiseSVN设置比较工具为BeyondCompare
首先打开小乌龟的setting
选择Diff Viewer属性相
修改属性为:
2对应 "C:\Program Files\Beyond Compare 4\BCompare.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly
4对应 "C:\Program Files\Beyond Compare 4\BCompare.exe"
选择Merge Tool相
修改属性为:
6对应 "C:\Program Files\Beyond Compare 4\BCompare.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname
修改好后点击确定
比对的效果
文中C:\Program Files\Beyond Compare 4\
为Beyond Compare的安装路径
Beyond Compare 4下载路径:链接:https://pan.baidu.com/s/1J7-uoacP8jM1TYRnkD6m4A
提取码:jzr8