--- a/tests/test-add.out	Fri Apr 11 12:04:26 2008 +0200
+++ b/tests/test-add.out	Fri Apr 11 12:52:56 2008 -0500
@@ -18,9 +18,7 @@
 warning: conflicts during merge.
 merging a failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-There are unresolved merges, you can redo the full merge using:
-  hg update -C 2
-  hg merge 1
+use 'hg resolve' to retry unresolved file merges
 M a
 ? a.orig
 % should fail