[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re[2]: Suggestion: include command lines for some common third-party merge tools

From: Fernando P. Nájera Cano <tortoisesvn_at_fernandonajera.com>
Date: 2005-10-22 00:59:29 CEST

Hi,

>>
>> ** araxis: the command line "compare /a1 /3 %base %mine %theirs
>> %merged" seems to work

SL> Thanks Eric, I have added your 2 suggestions to the docs with a minor
SL> amendment - I think kdiff3 should have "--L1 %bname" etc.

These are my settings for Araxis and I'm so happy with them...

Diffs:

compare.exe /max /wait /title1:%bname /title2:%yname %base %mine

Merges:

compare.exe /max /wait /3 /title1:%tname /title2:%bname /title3:%yname
%theirs %base %mine %merged /a2

Best regards,

Fernando Nájera 

-- 
avast! Antivirus: Mensaje saliente limpio.
Comprobado: 22/10/2005 1:00:03 - Base de datos: 0542-5, 21/10/2005
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Oct 22 01:00:40 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.