[PATCH 6 of 6] merge: use None as filename for base in 'both created' conflicts

[Pierre-Yves David]

On 11/25/2014 07:38 AM, Augie Fackler wrote:
> On Mon, Nov 24, 2014 at 09:22:52PM -0800, Martin von Zweigbergk wrote:
>> # HG changeset patch
>> # User Martin von Zweigbergk <martinvonz at google.com>
>> # Date 1416874622 28800
>> #      Mon Nov 24 16:17:02 2014 -0800
>> # Node ID 701701b84bba376ab63af472f3dc57730ba4c251
>> # Parent  9a17f0a1c28705f0d7fdf7732d94f27087892dad
>> merge: use None as filename for base in 'both created' conflicts
>
> Series looks good, but I think Pierre-Yves should review before this
> goes in.

This patches looks good to me.

-- 
Pierre-Yves David