view tests/test-simplemerge.py.out @ 32802:f40eec7af044

test-dirstate-race: back out changeset c82fa7efcbc8 This is non-deterministic. In any case, I switched to using debugrebuilddirstate in my WIP patches, which makes this moot.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 12 Jun 2017 13:10:09 -0700
parents f18830651811
children
line wrap: on
line source

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

OK