--- a/tests/test-merge9.out	Mon Jul 30 20:01:16 2007 +0200
+++ b/tests/test-merge9.out	Wed Aug 01 12:33:12 2007 -0500
@@ -5,7 +5,7 @@
 merging bar
 merging bar failed!
 merging foo and baz
-merging foo failed!
+merging baz failed!
 1 files updated, 0 files merged, 0 files removed, 2 files unresolved
 There are unresolved merges, you can redo the full merge using:
   hg update -C 2