[PATCH STABLE] merge: don't try to merge subrepos twice (issue4988)

Sat Jan 30 08:38:14 CST 2016

On 01/29/2016 11:26 PM, Siddharth Agarwal wrote:
> On 1/29/16 14:22, Siddharth Agarwal wrote:
>> # HG changeset patch
>> # User Siddharth Agarwal <sid0 at fb.com>
>> # Date 1454105969 28800
>> #      Fri Jan 29 14:19:29 2016 -0800
>> # Branch stable
>> # Node ID 4e74815fcb8b3197141c59fa5b26de1e59d1d0f1
>> # Parent  7cb7264cfd52d2672644db4bc16a0bd50aa093ca
>> # Available At http://42.netv6.net/sid0-wip/hg/
>> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r 4e74815fcb8b
>> merge: don't try to merge subrepos twice (issue4988)

The insensitive version have been pushed to the clowncopter, thanks.

-- 
Pierre-Yves David