changeset 35704 | 41ef02ba329b |
parent 30062 | 940c05b25b07 |
child 39277 | f785073f792c |
--- a/tests/test-merge-remove.t Thu Jan 04 21:37:03 2018 -0800 +++ b/tests/test-merge-remove.t Mon Jan 08 19:41:47 2018 +0530 @@ -106,7 +106,7 @@ use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u merging foo1 and foo to foo1 0 files updated, 1 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] $ cat bar bleh