Painful user experience with 'hg resolve'

[Antoine Pitrou]

On Fri, 26 Aug 2011 12:16:51 -0500
Matt Mackall <mpm at selenic.com> wrote:
> 
> If so, I frankly think that's tragic: it's always been
> my goal to avoid a user ever having to see those horrible things again.

For the record, some people prefer conflict markers, however archaïc
they seem.
I personally am more confident with editing conflicts by hand than
using some confusing three-pane view completely distinct (and
different) from my text editor.

Moreover, most of the time when facing a conflict I *have* to edit text
anyway, I can't just say "keep A" or "keep B". Given that, invoking an
intermediate tool (the merge tool) just gets in the way.

Regards

Antoine.