branch | stable |
changeset 3784 | 838fc71ddb9c |
parent 3783 | 313484606461 |
child 3812 | 25dfa95c37fd |
--- a/tests/test-prev-next.t Sun Jun 03 03:13:47 2018 +0530 +++ b/tests/test-prev-next.t Sun Jun 03 03:21:25 2018 +0530 @@ -425,7 +425,7 @@ $ echo bar > bar $ hg prev abort: conflicting changes - (commit or update --clean to discard changes) + (do you want --merge?) [255] $ echo hi > bar @@ -437,5 +437,5 @@ $ hg next abort: conflicting changes - (commit or update --clean to discard changes) + (do you want --merge?) [255]