diff tests/test-import-merge.t @ 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 bdc0e04df243
children eb586ed5d8ce
line wrap: on
line diff