1.打开TortoiseSVN的配置:
然后去找到对应的设置比较工具的地方:
Settings->Diff Viewer
把默认的 TortoiseMerge换成External,然后再设置为BeyondCompare。
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 (x86)\Beyond Compare 4\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.然后自己也看到对应的提示了:
参考别人,写成的:
"E:\dev_install\Beyond Compare 3\BCompare.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly
但是用之前,想要搞清楚:
这些参数的含义
其他还有哪些参数
其中的含义是:
- "E:\dev_install\Beyond Compare 3\BCompare.exe" 表示你的Beyond Compare的安装路径
- %base 表示你的左边的要比较的文件->要比较的基础base的文件
- %mine 表示要比较的右边的文件->mine,我的,我的新修改的文件
- /title1=%bname 左边的标题,标题1是base file的name
- /title2=%yname 右边的标题,标题2是新文件?的名字
- /leftreadonly 左边是只读->不允许修改->想要运行修改左边文件,则应该是不要加上此参数
即可。