diff -r 4c041f1ee1b4 -r b2310903c462 tests/test-resolve.out
--- a/tests/test-resolve.out	Sat Sep 19 01:15:38 2009 +0200
+++ b/tests/test-resolve.out	Thu Sep 17 22:39:38 2009 -0700
@@ -4,5 +4,5 @@
 created new head
 % failing merge
 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
 % resolve -l, should be empty