Conflicts on .hgtags, but no revisions on chevron markers?

[Eric Larson]

At Tue, 10 Nov 2009 21:47:10 +0100,
Dennis Brakhane wrote:
> 
> On Tue, Nov 10, 2009 at 9:45 PM, Clint Olsen <clint.olsen at gmail.com> wrote:
> > Can you suggest a merge tool?  I've found merge/diff on Linux &
> > FreeBSD to be a real mixed bag.
> 
> KDiff3 is pretty good.

Ediff in Emacs does a pretty decent job as well, even if you're not necessarily an Emacs user.

> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial