[PATCH] mergestate: handle additional record types specially

Pierre-Yves David pierre-yves.david at ens-lyon.org
Wed Nov 18 16:51:34 CST 2015



On 11/18/2015 11:46 AM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1447875906 28800
> #      Wed Nov 18 11:45:06 2015 -0800
> # Node ID 2a2a7a0cc1fa629aa4e096bd6045af510c05467c
> # Parent  65351015f3ca03102f39e00167864e139d48e477
> # Available At http://42.netv6.net/sid0-wip/hg/
> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r 2a2a7a0cc1fa
> mergestate: handle additional record types specially

Patch seems solid, but I've questions regarding its documentation. See 
below.

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list