--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -6,8 +6,7 @@ resolving manifests
  ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
  a: remote moved -> m
  b2: remote created -> g
-merging a and b to b
-resolving a
+merging a and b
 my a@. other b@8e765a822af2 ancestor a@af1939970a1c
 copying a to b
 removing a