Mercurial > hg
diff mercurial/merge.py @ 24553:afc29e29d569
dirstate: fix order of initializing nf vs f
Result of a bad merge.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 31 Mar 2015 15:41:02 -0700 |
parents | 1ff35d76421c |
children | a8e6897dffbe |