branch | mercurial-3.9 |
changeset 3112 | 706402d70b3f |
parent 3106 | a867d59ea97a |
parent 3004 | a456f55b3a6b |
--- a/tests/test-stabilize-result.t Fri Oct 20 22:22:14 2017 +0200 +++ b/tests/test-stabilize-result.t Fri Oct 20 18:44:52 2017 +0200 @@ -97,7 +97,7 @@ +newer a $ hg evolve --continue grafting 5:3655f0f50885 "newer a" - abort: unresolved merge conflicts (see 'hg help resolve') + abort: unresolved merge conflicts (see "hg help resolve") [255] $ hg resolve -m a (no more unresolved files)