changeset 35704 | 41ef02ba329b |
parent 35393 | 4441705b7111 |
child 35742 | 7a1806e0daea |
--- a/tests/test-sparse.t Thu Jan 04 21:37:03 2018 -0800 +++ b/tests/test-sparse.t Mon Jan 08 19:41:47 2018 +0530 @@ -224,7 +224,7 @@ merging hide warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon [1] $ hg debugsparse [exclude]