[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: Bart Robinson <lomew_at_pobox.com>
Date: 2005-12-21 20:35:25 CET

Check out kompare (kde, like p4 merge), xxdiff, winmerge, p4
merge (free)

-- bart

On 2005-12-21 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.
>
> Thanks in advance.
>
> Ted Stresen-Reuter
> http://www.tedmasterweb.com
> http://www.clevernet.biz
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Dec 24 23:59:47 2005

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