Wednesday, 21 November 2007

Ankh/TortoiseSVN and UltraCompare Settings

I always forget what the settings are to configure Ankh and TortoiseSVN to use UltraCompare as the default diff/merge tool, so for posterity here are the commands.

Diff:
C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe -t %base %mine

Merge:
C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe -rom %theirs %mine %merged