--- a/tests/test-commit-unresolved.out Wed Mar 04 17:02:16 2009 -0600
+++ b/tests/test-commit-unresolved.out Wed Mar 04 13:06:16 2009 -0600
@@ -6,7 +6,7 @@
warning: conflicts during merge.
merging A failed!
1 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
% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)