[PATCH 3 of 3 V2] merge: minimize conflicts when common base is not shown (issue4447)

[Pierre-Yves David]

On 02/10/2016 05:06 PM, Ryan McElroy wrote:
> # HG changeset patch
> # User Ryan McElroy <rmcelroy at fb.com>
> # Date 1455123968 28800
> #      Wed Feb 10 09:06:08 2016 -0800
> # Node ID cb5a7e8513b4fe65add68fc30cd6e052287f292b
> # Parent  b0a17fde066a6bc512a0bf4befa7f2f04544bb21
> merge: minimize conflicts when common base is not shown (issue4447)

I've pushed this series to the Clowncopter.

Massive thank for tackling this.

-- 
Pierre-Yves David