Mercurial > evolve
diff tests/test-stabilize-conflict.t @ 1516:c4f8a2916e43
tests: run test with 3.6 and apply test change
Tested with 3.4, 3.5 and 3.6. Some minor test update had to be done.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 30 Oct 2015 15:48:13 +0000 |
| parents | 362e2c8c5677 |
| children | 13701c3fed9c 0d8973818980 |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Fri Oct 30 16:04:37 2015 +0000 +++ b/tests/test-stabilize-conflict.t Fri Oct 30 15:48:13 2015 +0000 @@ -127,8 +127,7 @@ move:[5] babar count up to fifteen atop:[7] babar count up to ten merging babar - warning: conflicts during merge. - merging babar incomplete! (edit conflicts, then use 'hg resolve --mark') + warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') evolve failed! fix conflict and run "hg evolve --continue" or use "hg update -C" to abort abort: unresolved merge conflicts (see hg help resolve)