diff -r 85f5934016f9 -r 91a0bc50b288 tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t Mon Apr 15 22:58:10 2019 -0700 +++ b/tests/test-rebase-conflicts.t Thu Apr 11 23:28:38 2019 -0700 @@ -248,7 +248,6 @@ getting f1.txt merge against 9:e31216eec445 detach base 8:8e4e2c1a07ae - searching for copies back to rev 3 unmatched files in other (from topological common ancestor): f2.txt resolving manifests @@ -268,7 +267,6 @@ already in destination merge against 10:2f2496ddf49d detach base 9:e31216eec445 - searching for copies back to rev 3 unmatched files in other (from topological common ancestor): f2.txt resolving manifests