kdesvn original external diff program:
kompare -on -
kdiff3 %s1 %s2 %t
kdiff3 %o %m %n -o %t
now follow the url:
http://www.scootersoftware.com/support.php?zz=kb_vcs#kdesvn
- In KDESVN ChooseConfigure KDESVNfrom theSettingsmenu.
- SelectDiff & Merge.
- CheckUse external diff display.
- In theExternal diff displayedit, use:
-
bcompare -readonly %1 %2
- In theExternal merge programedit, use:
-
bcompare %s1 %s2 %t
- In theExternal resolver programedit, use:
-
bcompare %n %m %o %t
本文介绍如何在KDESVN中配置外部差异显示、合并及解决冲突程序,使用BCCompare作为首选工具。具体步骤包括设置外部差异显示、合并程序及解决冲突程序的命令行参数。
1645

被折叠的 条评论
为什么被折叠?



