branch | mercurial-3.9 |
changeset 2319 | ee321b87c548 |
parent 2110 | f1ffd093ef30 |
parent 2289 | 61d073590fb7 |
child 2597 | 22c05418ca71 |
--- a/tests/test-stabilize-result.t Wed May 03 13:18:08 2017 +0200 +++ b/tests/test-stabilize-result.t Wed May 03 13:23:36 2017 +0200 @@ -98,7 +98,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)