changeset 35704 | 41ef02ba329b |
parent 35393 | 4441705b7111 |
child 36200 | deb851914fd7 |
--- a/tests/test-add.t Thu Jan 04 21:37:03 2018 -0800 +++ b/tests/test-add.t Mon Jan 08 19:41:47 2018 +0530 @@ -104,7 +104,7 @@ merging a warning: conflicts while merging a! (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 st M a