branch | mercurial-3.9 |
changeset 2468 | 8fadd87da07e |
parent 2319 | ee321b87c548 |
child 2597 | 22c05418ca71 |
--- a/tests/test-stabilize-result.t Mon May 22 15:34:36 2017 +0200 +++ b/tests/test-stabilize-result.t Mon May 22 15:42:13 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)