--- a/tests/test-rename-dir-merge2.out	Fri Mar 23 00:12:28 2007 -0500
+++ b/tests/test-rename-dir-merge2.out	Thu Apr 05 16:43:18 2007 -0500
@@ -10,9 +10,11 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+merging a/f and b/f
+1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 M b/f
+  a/f
 A b/aa/g
   a/aa/g
 R a/aa/g