diff -r fcfb6a0a0a84 -r 92ccccb55ba3 tests/test-merge-revert2.out
--- a/tests/test-merge-revert2.out	Fri Apr 11 12:04:26 2008 +0200
+++ b/tests/test-merge-revert2.out	Fri Apr 11 12:52:56 2008 -0500
@@ -13,10 +13,7 @@
 warning: conflicts during merge.
 merging file1 failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-There are unresolved merges with locally modified files.
-You can redo the full merge using:
-  hg update 0
-  hg update 1
+use 'hg resolve' to retry unresolved file merges
 diff -r f248da0d4c3e file1
 --- a/file1
 +++ b/file1