Mercurial > hg

comparison tests/test-pathconflicts-merge.t @ 37087:e4640ec346ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 41ef02ba329b
children a8a0cafcef79
comparison
equal deleted inserted replaced
37086:658b1d28813c 37087:e4640ec346ac