[PATCH] merge: add conflict labels to merge command

[Simon Farnsworth]

On 08/10/2016 11:31, Pierre-Yves David wrote:
> On 10/08/2016 10:26 AM, Simon Farnsworth wrote:
>> # HG changeset patch
>> # User Simon Farnsworth <simonfar at fb.com>
>> # Date 1475855510 25200
>> #      Fri Oct 07 08:51:50 2016 -0700
>> # Node ID 9293c425580b06b3ab10f9648b35e4a982cc5c67
>> # Parent  91a3c58ecf938ed675f5364b88f0d663f12b0047
>> merge: add conflict labels to merge command
>
> Pushed, thanks, test-subrepo-git.t and test-subrepo.t says hi.
>
> Cheers,
>

They pass for me without fixups - I'm running git v2.9.3 and running the 
test suite with ./run-tests.py -l -j24.

I see a failure in test-paths.t, because zeroconf assumes I have IPv4 
locally (I don't). Even if I run those two tests individually, I don't 
see issues.
-- 
Simon Farnsworth