Re: Recommended merge tool

From: Purple Streak <mrpurplestreak_at_googlemail.com>
Date: Wed, 19 Nov 2008 04:02:29 +0000

2008/11/18 Bogdan Cristea <cristeab_at_gmail.com>:
> Could you recommend an open source merge tool for subversion? By that I
> mean the application specified in SVN_MERGE environment variable, which can
> be called with 'l' when a conflict is discovered during a merge operation.
> thanks

Perforce release their merge tool for free which looks pretty cool -
however when I was last testing a few tools I found KDiff3 to be
accurate at correctly working out which bits matched in the files
which makes the merge easier. Both of these are cross platform

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-19 05:02:50 CET

This message: [ Message body ]
Next message: Ryan Schmidt: "Re: Accessing subversion repository using svn+ssh protocol remotely"
Previous message: Purple Streak: "Fwd: merging a partial branch"
In reply to: Bogdan Cristea: "Recommended merge tool"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]