--- a/tests/test-rename-merge1.t	Sat May 17 00:47:42 2014 -0700
+++ b/tests/test-rename-merge1.t	Fri May 02 01:09:14 2014 +0200
@@ -36,22 +36,22 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
-   a2: divergent renames -> dr
+   b2: remote created -> g
    b: remote moved from a -> m
     preserving a for resolve of b
-   b2: remote created -> g
+   a2: divergent renames -> dr
   removing a
   getting b2
   updating: b2 1/3 files (33.33%)
-  updating: a2 2/3 files (66.67%)
-  note: possible conflict - a2 was renamed multiple times to:
-   c2
-   b2
-  updating: b 3/3 files (100.00%)
+  updating: b 2/3 files (66.67%)
   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
+  updating: a2 3/3 files (100.00%)
+  note: possible conflict - a2 was renamed multiple times to:
+   c2
+   b2
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
@@ -181,8 +181,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0
+   newfile: remote created -> g
    file: rename and delete -> rd
-   newfile: remote created -> g
   getting newfile
   updating: newfile 1/2 files (50.00%)
   updating: file 2/2 files (100.00%)