svn配合beyond compare

1 下载beyond compare3安装，一般安装完成后，会出现：右键-->选择左侧文件来比较选项。

2 需要将svn自带的diff工具换为BC3，svn-->settings-->DiffViwer-->External,

填入：

"D:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

第二个：

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

第三个：

"D:\Program Files\Beyond Compare 3\BCompare.exe"

-->保存

 

 

3.差异查看&合并工具，和上面第二个一样

设置merge tool，外部

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