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

[TSVN] Re: TortoiseMerge

From: Björn Eriksson <owbear_at_gmail.com>
Date: 2005-09-20 09:19:50 CEST

Jan Normann Nielsen <lists <at> dubbekarl.dk> writes:
> Flanakin Michael C Ctr HQ OSSG/OMR wrote:
>
> > One feature that I'd love to see in TMerge is text editing. There are
> > a lot of times where I notice something that needs to be changed while
> > I'm doing a diff. Being able to update it during the diff would be
> > very helpful. Are there any plans on supporting a capability like this
>
> I really need this feature too. As long as TMerge doesn't have text
> editing capability, I stick with WinMerge.

 Also, have a look at kdiff3 - fairly slick 3way diffing.

 Config example: `kdiff3.exe %base %mine %theirs -o %merged`.

-- 
//Björnen
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Sep 20 09:49:21 2005

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