Painful user experience with 'hg resolve'

[Dirkjan Ochtman]

On Fri, Aug 26, 2011 at 19:42, Antoine Pitrou <solipsis at pitrou.net> wrote:
> 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.

Another +1 from me.

Cheers,

Dirkjan