tests/test-rename-merge1.out
changeset 3314 ecc1bf27378c
parent 3305 e7abcf3a7c5f
child 3317 966632304dde
--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -4,7 +4,7 @@ merge
 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