Re: Recommended merge tool

Concerning Recommended merge tool
Bogdan Cristea wrote on 18 Nov 2008, 10:11, at least in part:

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

Depends on the OS. For Windows you might try:

http://sourceforge.net/projects/winmerge

With a built-in editor it provides more power than just choosing
left/right version. In TortoiseSVN it is defined here for all diff &
merge operations, supposedly one can also call it from the SVN
commandline.

As an aside for conflicts I usually rather open the file in a plain
editor and search for "=====", that gets me directly to the conflict
zone, skipping all the other nicely merged differences. If things are
complicated - I mean the conflicting changes are so trivial one
wouldn't see them ;) - WinMerge still can highlight the actual
differences, but at least one knows in which paragraph to look...

Jan Hendrik

---------------------------------------
Freedom quote:

     Je mehr Freiheit, desto weniger Gleichheit;
     je mehr Gleichheit, desto weniger Freiheit.
               -- Max Horkheimer

---------------------------------------------------------------------
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-18 09:27:34 CET