--- a/tests/test-conflict.out	Wed Mar 04 17:02:16 2009 -0600
+++ b/tests/test-conflict.out	Wed Mar 04 13:06:16 2009 -0600
@@ -4,7 +4,7 @@
 warning: conflicts during merge.
 merging a 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
 e7fe8eb3e180+0d24b7662d3e+ tip
 <<<<<<< local
 something else