Painful user experience with 'hg resolve'

[Isaac Jurado]

On Fri, Aug 26, 2011 at 7:42 PM, 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.
>
> 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.

If you use vim, you can configure vimdiff as your merge tool.  I guess
emacs has similar functionality.  They come very handy when you are
operating over SSH sessions with no X11 forwarding.

The only problem is that I never know which file I must save ($local,
$base or $other) when $output is not specified in the merge tool
arguments.

Cheers.

-- 
Isaac Jurado

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci