change/delete conflicts and explicit merge tools

[Siddharth Agarwal]

On 11/13/15 17:17, Pierre-Yves David wrote:
>
> I agree that the current behavior (a) is broken, we should not just 
> pick a random side and declare the merge successful.
>
> +1 for "leave unresolved"
>
> I think I lean toward (c) prompt instead of (b) fail. Because 
> requiring all user to got through `hg resolve --tool` seems like bad 
> idea. This seems far to complicated to get basic user out of troubles, 
> we'll loose people in the process.

So for interactive merges we continue to prompt, and for non-interactive 
merges we prompt but then say 'l' for 'leave unresolved'. This is still 
a behavior change, but likely one for the better.

I think that sounds reasonable.