[PATCH 4 of 4 mergedriver] filemerge: default regular prompts to 'leave unresolved' (BC)

[Martin von Zweigbergk]

On Tue, Dec 1, 2015 at 1:24 PM Siddharth Agarwal <sid0 at fb.com> wrote:

> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1448992118 28800
> #      Tue Dec 01 09:48:38 2015 -0800
> # Node ID 2c40d5addf46f6b712d38540b2dd51c2f22d9a96
> # Parent  742869a0c53d2f50f835aad600b8609dcdd5229c
> # Available At http://42.netv6.net/sid0-wip/hg/
> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r 2c40d5addf46
> filemerge: default regular prompts to 'leave unresolved' (BC)
>
> It makes far more sense to leave these conflicts unresolved and kick back
> to
> the user than to just assume that the local version be chosen. There are
> almost
> certainly buggy scripts and applications using Mercurial in the wild that
> do
> merges or rebases non-interactively, and then assume that if the operation
> succeeded there's nothing the user needs to pay attention to.
>

Great.

Nice series! Pushed to the clowncopter.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151201/3edcc05f/attachment.html>