配置tortoiseSVN的merg工具

2007-03-16

bailing

settings

d:\p\KDiff3\kdiff3.exe %base %mine %theirs -o %merged --L1 Base --L2 Mine --L3 Theirs
d:\p\KDiff3\kdiff3.exe %base %mine  --L1 Base --L2 Mine

D:\p\IDM Computer Solutions\UltraCompare\uc.exe -3 -o %base %mine %theirs %merged
D:\p\IDM Computer Solutions\UltraCompare\uc.exe -qc %base %mine