--- a/tests/test-merge7.out Sat Sep 19 01:15:38 2009 +0200
+++ b/tests/test-merge7.out Thu Sep 17 22:39:38 2009 -0700
@@ -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 or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' 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 or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
one
<<<<<<< local
two-point-five