Mercurial > evolve
diff tests/test-stabilize-result.t @ 2319:ee321b87c548 mercurial-3.9
merge with future 6.1.0
No extra adjustment needed from hg-4.0 result
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 03 May 2017 13:23:36 +0200 |
| parents | f1ffd093ef30 61d073590fb7 |
| children | 22c05418ca71 |
line wrap: on
line diff
--- 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)