Mercurial > hg

diff tests/test-merge10.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 eb586ed5d8ce
children faa49a5914bb
line wrap: on
line diff