view tests/test-simplemerge.py.out @ 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 f18830651811
children
line wrap: on
line source

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK