[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: Judson Wilson <judson_at_powerstandards.com>
Date: Thu, 10 Feb 2011 09:46:49 -0800

> 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/

Interesting, will check it out when I get some free time. Thanks!

> KDiff3 (don't use for diffing, only for merge
> http://kdiff3.sourceforge.net/
>
I actually use it for diffing as well, but I still set it to use merge
mode with the output being the working copy, in case I want to make
edits while I diff. There are definitely cons to doing it this way, but
I like several of the core features of kdiff3 even while doing a diff.

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

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

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