[PATCH] dirstate: fix order of initializing nf vs f

Matt Mackall mpm at selenic.com
Tue Mar 31 17:50:05 CDT 2015


On Tue, 2015-03-31 at 15:44 -0700, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0 at fb.com>
> # Date 1427841662 25200
> #      Tue Mar 31 15:41:02 2015 -0700
> # Node ID 680fbcf0edcd6e7464594d88266d1794a4eaf4e4
> # Parent  9fbda55c68d77d0c026d458ac228e9f98c62d64f
> dirstate: fix order of initializing nf vs f
> 
> Result of a bad merge.

Indeed. Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list