Chinaunix首页 | 论坛 | 博客
  • 博客访问: 1557431
  • 博文数量: 347
  • 博客积分: 9328
  • 博客等级: 中将
  • 技术积分: 2680
  • 用 户 组: 普通用户
  • 注册时间: 2010-07-29 23:45
文章分类

全部博文(347)

文章存档

2016年(1)

2013年(4)

2012年(207)

2011年(85)

2010年(50)

分类: Delphi

2011-06-24 00:02:03

This is for future reference for me – for some reason this is a huge pain in the ass for me to find whenever I need it.

Here is the official documentation on how to integrate BC3 with TortoiseSVN.

Here are my settings (on 64 bit machine):
Diff Viewer

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

Put the SAME THING for both “comparing different revisions of files” and “comparing different revisions of properties”.
Merge Tool

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

阅读(1714) | 评论(0) | 转发(0) |
给主人留下些什么吧!~~