--- a/tests/test-rename-merge1.t	Wed Dec 10 10:32:51 2014 +0100
+++ b/tests/test-rename-merge1.t	Fri Dec 05 16:13:26 2014 -0800
@@ -40,15 +40,13 @@
   removing a
    b2: remote created -> g
   getting b2
-  updating: b2 1/3 files (33.33%)
+  updating: b2 1/2 files (50.00%)
    b: remote moved from a -> m
-  updating: b 2/3 files (66.67%)
+  updating: b 2/2 files (100.00%)
   picked tool 'internal:merge' for b (binary False symlink False)
   merging a and b to b
   my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
    premerge successful
-   a2: divergent renames -> dr
-  updating: a2 3/3 files (100.00%)
   note: possible conflict - a2 was renamed multiple times to:
    c2
    b2
@@ -183,9 +181,7 @@
    ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0
    newfile: remote created -> g
   getting newfile
-  updating: newfile 1/2 files (50.00%)
-   file: rename and delete -> rd
-  updating: file 2/2 files (100.00%)
+  updating: newfile 1/1 files (100.00%)
   note: possible conflict - file was deleted and renamed to:
    newfile
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved