[PATCH 4 of 4 mergedriver] merge: move almost all change/delete conflicts to resolve phase (BC) (API)

[Martin von Zweigbergk]

On Mon, Nov 30, 2015 at 2:30 PM Siddharth Agarwal <sid0 at fb.com> wrote:

> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1448490333 28800
> #      Wed Nov 25 14:25:33 2015 -0800
> # Node ID 2d7ab840e26d1a5dfc1483c21e8bf0cbb1babafa
> # Parent  e4745330dbb979cc776cf909c4355425f145ebaa
> # Available At http://42.netv6.net/sid0-wip/hg/
> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r 2d7ab840e26d
> merge: move almost all change/delete conflicts to resolve phase (BC) (API)
>

Hooray! I've pushed this to the clowncopter, thanks!

I didn't review the added tests, but I have checked that they pass. There
were just too many tests for me to review.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151130/27642146/attachment.html>