changeset 7821 | 9fe7e6acf525 |
parent 7627 | fb32ae9c76e7 |
child 7993 | b83a11536fc6 |
--- a/tests/test-keyword.out Wed Mar 04 17:02:16 2009 -0600 +++ b/tests/test-keyword.out Wed Mar 04 13:06:16 2009 -0600 @@ -458,7 +458,7 @@ warning: conflicts during merge. merging m 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 % keyword stays outside conflict zone $Id$ <<<<<<< local