[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: Steve Williams <stevewilliams_at_kromestudios.com>
Date: 2005-10-21 00:15:51 CEST

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.

This message and its attachments may contain legally privileged or confidential information. This message is intended for the use of the individual or entity to which it is addressed. If you are not the addressee indicated in this message, or the employee or agent responsible for delivering the message to the intended recipient, you may not copy or deliver this message or its attachments to anyone. Rather, you should permanently delete this message and its attachments and kindly notify the sender by reply e-mail. Any content of this message and its attachments, which does not relate to the official business of the sending company must be taken not to have been sent or endorsed by the sending company or any of its related entities. No warranty is made that the e-mail or attachment(s) are free from computer virus or other defect.
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:16:15 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.