--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -21,7 +21,7 @@ resolving manifests
b: remote created -> g
merging a
resolving a
-my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b
+my a@. other a@802f095af299 ancestor a@33aaa84a386b
getting b
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
changeset: 1:802f095af299
@@ -55,7 +55,7 @@ resolving manifests
b: remote created -> g
merging a
resolving a
-my a@33aaa84a386b other a@802f095af299 ancestor a@33aaa84a386b
+my a@. other a@802f095af299 ancestor a@33aaa84a386b
getting b
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
changeset: 1:802f095af299
@@ -106,10 +106,10 @@ resolving manifests
b: versions differ -> m
merging a
resolving a
-my a@802f095af299 other a@030602aee63d ancestor a@33aaa84a386b
+my a@. other a@030602aee63d ancestor a@33aaa84a386b
merging b
resolving b
-my b@802f095af299 other b@030602aee63d ancestor b@000000000000
+my b@. other b@030602aee63d ancestor b@000000000000
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
changeset: 1:802f095af299