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

[Clint Olsen]

Can you suggest a merge tool?  I've found merge/diff on Linux &
FreeBSD to be a real mixed bag.

Thanks,

-Clint

On Tue, Nov 10, 2009 at 11:40 AM, Matt Mackall <mpm at selenic.com> wrote:
>
> Yeah, we don't support that currently and you're the first person to ask
> for it. Internal merge conflict markers are the method of last resort,
> most of the world uses some sort of GUI merge tool.
>
> --
> http://selenic.com : development and support for Mercurial and Linux
>
>
>