--- a/tests/test-rename-merge2.t Tue May 02 23:47:10 2017 -0700
+++ b/tests/test-rename-merge2.t Wed May 03 10:43:59 2017 -0700
@@ -89,7 +89,6 @@
preserving a for resolve of b
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
- a: remote unchanged -> k
b: remote copied from a -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging a and b to b
@@ -652,7 +651,6 @@
preserving b for resolve of b
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
- a: remote unchanged -> k
b: both created -> m (premerge)
picked tool 'python ../merge' for b (binary False symlink False changedelete False)
merging b