Araxis Merge

Araxis Merge下载并在SVN配置

Araxis Merge下载
http://xikuan.newhua.com:82/down/Merge2012.4260-Win32.zip

合并比较工具
在Merge Tool中可以选择用来合并的工具，强烈推荐用Araxis Merge。在[Setting]->[Diff]中填入“C:\Program Files\Araxis\Araxis Merge v6.5\Merge.exe”；在[Setting]->[Merge]的选项中，填入“C:\Program Files\Araxis\Araxis Merge v6.5\Merge.exe” %theirs %mine %merged ；其中“C:\Program Files\Araxis\Araxis Merge v6.5\Merge.exe”是指合并工具的路径，%theirs %mine %merged分别指..将要合并到主干的分支，主干，及合并后的结果。

SVN配置参考
http://www.oksvn.com/Article/Detail-286.shtml