--- a/tests/test-merge7.out	Wed Mar 04 17:02:16 2009 -0600
+++ b/tests/test-merge7.out	Wed Mar 04 13:06:16 2009 -0600
@@ -11,7 +11,7 @@
 warning: conflicts during merge.
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 pulling from ../test-a
 searching for changes
 adding changesets
@@ -31,7 +31,7 @@
 warning: conflicts during merge.
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
+use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
 one
 <<<<<<< local
 two-point-five