tests/test-rename-merge1.out

--- a/tests/test-rename-merge1.out	Mon Oct 09 21:04:25 2006 -0500
+++ b/tests/test-rename-merge1.out	Mon Oct 09 21:27:04 2006 -0500
@@ -8,7 +8,7 @@
  b2: remote created -> g
 merging a and b to b
 resolving a
-my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c
+my a@. other b@8e765a822af2 ancestor a@af1939970a1c
 copying a to b
 removing a
 getting b2