changeset 9468 | b2310903c462 |
parent 7821 | 9fe7e6acf525 |
child 11451 | 51021f4c80b5 |
--- 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