配置
"C:\Program Files (x86)\Beyond Compare x为安装路径
第一步
- 右键->TortoiseSVN
- 选择Setting
- 选择Diff Viewer- 填写"C:\Program Files (x86)\Beyond Compare x\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly
- 填写"C:\Program Files (x86)\Beyond Compare 3\BCompare.exe"
- 填写"C:\Program Files (x86)\Beyond Compare 3\BCompare.exe"
 
- 填写

第二步
- 选择Merge Toole
- 填写"C:\Program Files (x86)\Beyond Compare x\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

