tests/test-rename-merge1.out

--- a/tests/test-rename-merge1.out	Tue Oct 10 00:32:30 2006 -0500
+++ b/tests/test-rename-merge1.out	Tue Oct 10 00:41:55 2006 -0500
@@ -4,7 +4,7 @@
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
- a: remote moved -> c
+ a: remote moved -> m
  b2: remote created -> g
 merging a and b to b
 resolving a