[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-partymerge tools

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-10-21 00:40:43 CEST

Steve Williams wrote:
> Eric Hanchrow wrote:
>> Actually, this is two suggestions:
>> * make a nice UI for choosing a third-party merge tool
>> * 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
> I'm still trying to find the command-line to use WinMerge as the merge
> tool. I've asked twice on this list and never got any responses.

According to WinMerge help, it seems that bog standard WinMerge does not
do the 3 way diff with merge output, which is what is required for
resolving conflicts. You need Perforce WinMerge for that, and the
commandline for P4WinMerge is already in the TSVN helpfile.


   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 00:41: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.