Mercurial > evolve
diff tests/test-evolve-stop-phasediv.t @ 3914:96945ea908df stable
branching: merge default into stable
The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 12:52:06 +0200 |
| parents | 629558d09898 |
| children | 25981fae92f9 |
line wrap: on
line diff
--- a/tests/test-evolve-stop-phasediv.t Wed Jul 25 15:30:37 2018 -0700 +++ b/tests/test-evolve-stop-phasediv.t Tue Jul 31 12:52:06 2018 +0200 @@ -84,10 +84,8 @@ rebasing to destination parent: ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - evolution failed! - fix conflict then run 'hg evolve --continue' or use `hg evolve --abort` - abort: unresolved merge conflicts (see hg help resolve) - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ hg evolve --stop stopped the interrupted evolve