changeset 4676 | b6c819facbe8 |
parent 4579 | e6d7d261ca4a |
--- a/tests/test-evolve-issue5966.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-issue5966.t Thu Jun 06 17:37:42 2019 +0800 @@ -57,7 +57,8 @@ $ hg evolve -t :fail --rev 'first(orphan())' move:[2] banana atop:[4] apricot - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --list 34a690fcf6ab: banana