[PATCH 5 of 6 mergedriver] filemerge: move precheck to before files are written out

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu Oct 8 05:46:08 CDT 2015



On 10/08/2015 12:33 AM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1444278523 25200
> #      Wed Oct 07 21:28:43 2015 -0700
> # Node ID 57d94e0c31e4072ffdf0aa4a7fa2934e22dfe068
> # Parent  5436157f86676d0d7cc7e6d49ad462a0c63938ce
> filemerge: move precheck to before files are written out

Patches 1-5 are pushed to the clowncopter. Patch 6 is a bit more beefy 
and will get love tomorrow.

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list