[PATCH] merge: use labels in subrepo merge

[Pierre-Yves David]

On 10/08/2016 10:26 AM, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth <simonfar at fb.com>
> # Date 1475915128 25200
> #      Sat Oct 08 01:25:28 2016 -0700
> # Node ID 6b8becb59babb6ac9770d41551c2e533673b694c
> # Parent  91a3c58ecf938ed675f5364b88f0d663f12b0047
> merge: use labels in subrepo merge

I've pushed this, I had to update test-subrepo-git.t, test-subrepo.t.

Thanks.

-- 
Pierre-Yves David