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

Re: (somewhat off topic) Graphical diff/merge tool

From: Andy Berdan <berdandy_at_gmail.com>
Date: 2005-12-22 16:44:46 CET

I've been using KDiff3 with great success in TortoiseSVN. It supports
the 3-way merge that SVN (and some other versioning systems) require
for conflict resolution.

http://kdiff3.sourceforge.net/

With Tortoise, use "kdiff3 %base %mine %theirs -o %merged" as the
external program setting.

I haven't set it up with commandline svn, but the diff3-cmd option in
svn config seems promising:
http://svnbook.red-bean.com/en/1.1/ch07.html#svn-ch-7-sect-1.3.2

Cheers,
  Andy.

On 12/21/05, G. T. Stresen-Reuter <tedmasterweb@mac.com> wrote:
> Hi,
>
> I'm wondering if anyone can recommend a graphical diff/merge tool for
> Linux that integrates with Subversion.
>
> Specifically, I'm looking for graphical tools that can help resolve
> conflicts that arise when committing or updating files in working
> copies.
>
> [snipped]

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 25 02:45:44 2005

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