Constant text conflicts - newb needs some help

[Stefan Monnier]

> I recommend the following free software merge tools:

> * bzr `extmerge`_ plugin

> * one of `kdiff3`_ or `meld`_ as GUI merge tools -- I use meld the most

> .. _extmerge: http://erik.bagfors.nu/bzr-plugins/extmerge/
> .. _kdiff3: http://kdiff3.sourceforge.net/
> .. _meld: http://meld.sourceforge.net/

Of course, there's also Ediff and Smerge-Mode, bundled with Emacs.


        Stefan "author of the second, maintainer of the third"