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

[Matt Mackall]

On Tue, 2009-11-10 at 11:30 -0800, Clint Olsen wrote:
> Hi:
> 
> I had a need to move a tag, and so I tried to push this back to the
> parent and ran into conflicts on my pull, first.  Anyway, the chevrons
> were there, indicating the conflict, but without revision notes in the
> chevrons, it's a bit of a mystery of how to resolve the conflict w/o
> some indication of which block goes with which revision w/o actually
> manually inspecting the parent to see what it had in .hgtags.  Did I
> do something wrong or is this just a missing feature?

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