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

[Greg Ward]

On Sun, Mar 7, 2010 at 8:50 AM, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> On Sun, Mar 7, 2010 at 14:11, Isaac Jurado <diptongo at gmail.com> wrote:
>> In order to achieve dummy merges, one has two options:
>>
>>    hg --config ui.merge=internal:local merge
>>    hg debugsetparents . other_head
>
> Actually the nice version IMO is hg revert -r. -a.

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?"

Greg