branch | stable |
changeset 1745 | 6c922448ccec |
parent 1737 | 5383671ef612 |
child 1746 | 343298df3f26 |
child 1753 | 9fd15f27c91c |
--- a/tests/test-stabilize-result.t Sun Oct 16 09:52:53 2016 -0700 +++ b/tests/test-stabilize-result.t Fri Oct 28 15:44:15 2016 +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)