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

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

From: Eric Hanchrow <offby1_at_blarg.net>
Date: 2005-10-20 18:38:35 CEST

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've laid out in my will that my heirs should continue working
on my .emacs
        -- johnw
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Oct 20 18:53:03 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.