Mercurial > evolve
changeset 1868:5cdd5e0a421c
test: adapt to newer mercurial
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 23 Oct 2015 13:40:44 +0100 |
| parents | c9cacc62fa17 |
| children | 995617c7f2fc |
| files | tests/test-topic.t |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-topic.t Thu Oct 08 20:43:15 2015 -0700 +++ b/tests/test-topic.t Fri Oct 23 13:40:44 2015 +0100 @@ -287,8 +287,7 @@ $ hg ci -m 'Narf is like `zort` or `poit`!' $ hg merge narf merging alpha - warning: conflicts during merge. - merging alpha incomplete! (edit conflicts, then use 'hg resolve --mark') + warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1]