[PATCH 3 of 3 mergedriver V4] mergestate: handle additional record types specially

[Pierre-Yves David]

On 11/18/2015 11:45 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1447890405 28800
> #      Wed Nov 18 15:46:45 2015 -0800
> # Node ID ddb52912cea97bd7eaf4342e6a889f739928a19c
> # Parent  f80b12a9b9ce8136040eecc1c1f07231550ee6a7
> # Available At http://42.netv6.net/sid0-wip/hg/
> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r ddb52912cea9
> mergestate: handle additional record types specially

And these are pushed to the clowncopter. Thanks.

Consider mentioning the hash of the faulty merge next time.

-- 
Pierre-Yves David