Mercurial > evolve
changeset 1119:7068ccfed963
test: adapt to core mercurial 9ab18a912c44
This changesets improved the output of prompt during test.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 02 Oct 2014 15:53:54 -0500 |
| parents | fbc400c1b022 |
| children | 9bc4857f573b |
| files | tests/test-stabilize-conflict.t |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Thu Oct 02 15:50:07 2014 -0500 +++ b/tests/test-stabilize-conflict.t Thu Oct 02 15:53:54 2014 -0500 @@ -217,7 +217,8 @@ atop:[10] babar count up to ten merging babar output file babar appears unchanged - was merge successful (yn)? merging babar failed! + was merge successful (yn)? n + merging babar failed! evolve failed! fix conflict and run "hg evolve --continue" abort: unresolved merge conflicts (see hg help resolve)