[PATCH] merge: add conflict labels to merge command

[Pierre-Yves David]

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,

-- 
Pierre-Yves David