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

Re: Compare URLs allows editing

From: Andreas Stieger <andreas.stieger_at_gmx.de>
Date: Thu, 10 Feb 2011 17:02:46 +0000

On 10/02/2011 16:55, Judson Wilson wrote:

> Just throwing this out there: If you are having issues with
> TortoiseMerge, I would suggest setting up and learning kdiff3. I find
> it to be a much better program for merging (which I know is a matter of
> taste). Once you learn it and set it up correctly, it works really
> really well. After learning 3 way merging, you will never want to go back.
>
> One small caveat: the windows version does have a few bugs.

DiffMerge beats kdiff3 by miles and is slightly more pleasing to the
eye. URLs and instructions how to set up both as a merge tool within
TortoiseSVN below.

DiffMerge http://www.sourcegear.com/diffmerge/

Diff: C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe -nosplash -t1=%bname -t2=%yname %base %mine
Merge: C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe -caption=%mname -result=%merged -merge -nosplash -t1=%yname -t2=%bname -t3=%tname %mine %base %theirs

KDiff3 (don't use for diffing, only for merge
http://kdiff3.sourceforge.net/

C:\Program Files\KDiff3\kdiff3.exe %base %mine %theirs -o %merged --L1 Base --L2 Mine --L3 Theirs

With kind regards,
Andreas Stieger

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2703295

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-10 18:02:44 CET

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