Mercurial > hg
diff mercurial/filemerge.py @ 37087:e4640ec346ac
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker
Per the docstring for dirstate.normalize().
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 22 Mar 2018 22:58:31 -0400 |
parents | f0b6fbea00cf |
children | a8a902d7176e |