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

[Clint Olsen]

I just went through hell trying to build diffuse on our "White Box
Enterprise Linux release 3.0" machines without success.  As usual,
anything that relies on GTK or Gnome is a near impossibility unless
you feel like building everything from scratch in a standalone tree.
No, I don't have root privileges.  So, assuming that we all have
kdiff3 or some other graphical diff utility a few keystrokes away is
an oversight.

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