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

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

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-10-21 10:58:37 CEST

Eric Hanchrow wrote:
> * have TortoiseSVN know about some of the more common ones, such as
> ** araxis: the command line "compare /a1 /3 %base %mine %theirs
> %merged" seems to work
> ** kdiff3: the compare line "C:\Program Files\KDiff3\kdiff3.exe %base
> %mine %theirs -o %merged --L1 Base --L2 Mine --L3 Theirs" seems to
> work

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


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Oct 21 10:59:07 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.