首先打开小乌龟的setting

TortoiseSVN设置比较工具为BeyondCompare-风君子博客

选择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"

TortoiseSVN设置比较工具为BeyondCompare-风君子博客

选择Merge Tool相

修改属性为:

6对应    "C:\Program Files\Beyond Compare 4\BCompare.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

TortoiseSVN设置比较工具为BeyondCompare-风君子博客

修改好后点击确定

比对的效果

TortoiseSVN设置比较工具为BeyondCompare-风君子博客

文中C:\Program Files\Beyond Compare 4\为Beyond Compare的安装路径