[PATCH 0 of 1] Select internal conflict resolution tool with a merge option

[Dirkjan Ochtman]

On Sun, Mar 7, 2010 at 16:28, Greg Ward <greg-hg at gerg.ca> wrote:
> Which is annoying because the preceding "merge" command can interrupt
> the process with prompts.  Or at least it has done so to me at some
> point in the distant past.  "WTF? Why should I have to answer this
> prompt when I'm simply going to revert any additions/removals merged
> in from the other head?"

True. And I've also at times in the past wanted to reach for one of
the internal merge tools and failed because the invoking syntax is
rather intricate, if you don't use it often.

Cheers,

Dirkjan