tests/test-merge-internal-tools-pattern.out
changeset 7821 9fe7e6acf525
parent 6550 628da4a91628
child 9468 b2310903c462
--- a/tests/test-merge-internal-tools-pattern.out	Wed Mar 04 17:02:16 2009 -0600
+++ b/tests/test-merge-internal-tools-pattern.out	Wed Mar 04 13:06:16 2009 -0600
@@ -9,7 +9,7 @@
 created new head
 # merge using internal:fail tool
 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
 line 1
 line 2
 third line