--- a/tests/test-rename-merge1.out	Tue Oct 10 02:11:59 2006 -0500
+++ b/tests/test-rename-merge1.out	Tue Oct 10 02:15:20 2006 -0500
@@ -2,12 +2,12 @@
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 merge
 resolving manifests
- overwrite None branchmerge True partial False
- ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
+ overwrite None partial False
+ ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
  a: remote moved -> m
  b2: remote created -> g
 merging a and b
-my a@. other b@8e765a822af2 ancestor a@af1939970a1c
+my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
 copying a to b
 removing a
 getting b2