[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: Scott Moynes <scott.moynes_at_gmail.com>
Date: 2005-12-21 18:03:40 CET

On 12/21/05, G. T. Stresen-Reuter <tedmasterweb@mac.com> wrote:
> 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.

You may have some success with meld. <http://meld.sourceforge.net/>

I have not used it with subversion, but it does seem to have some
support for subversion working copies.

Cheers,

--
Scott Moynes
"The purpose of computing is insight, not numbers." - Richard W. Hamming
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 25 04:34:17 2005

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