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

[Greg Ward]

On Sun, Mar 7, 2010 at 10:33 AM, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> 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.

Both good arguments for Isaac's patch.  I'm pretty sure I like it.
I'll have to give it a try.

Hmmm: perhaps the way to support dummy merges properly is with a new
internal:dummy merge tool.  It'd be like internal:local only stronger:
ignore *everything* in the other branch, not just file merges.

Isaac, is that the direction you were heading in?  Then people who
want a "dummymerge" command can simply alias "dummymerge = merge -i
dummy".

Greg