diff -r e9bae5c80ab4 -r 784eadabd985 tests/test-rename-after-merge.out
--- a/tests/test-rename-after-merge.out	Fri Dec 07 02:01:10 2007 -0600
+++ b/tests/test-rename-after-merge.out	Fri Dec 07 02:01:13 2007 -0600
@@ -14,7 +14,9 @@
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
+M b
 % rename b as c
 A c
 R b
 % rename back c as b
+M b