diff mercurial/tagmerge.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 e53f6b72a0e4
children fa91c49a9b9f
line wrap: on
line diff