[PATCH 7 of 7 mergedriver] commands.resolve: print out warning when only driver-resolved files remain

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sun Oct 18 07:45:02 CDT 2015



On 10/17/2015 04:35 AM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1444896598 25200
> #      Thu Oct 15 01:09:58 2015 -0700
> # Node ID 9e297e9eef1d4dc0066f55dfc98e5e89a3897aaa
> # Parent  ab0392a6462acbd3084b9493e12b0701b02fe0ce
> commands.resolve: print out warning when only driver-resolved files remain
>
> 'hg resolve --all' will be the canonical way to run the 'conclude' step of the
> merge driver.

These ones are pushed to the clowcopter

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list