diff tests/test-stabilize-result.t @ 4311:8aa28e68ac44 stable

evolve: detect unresolved conflict during evolve --continue (issue5966)

Evolve --continue was ignoring unresolved conflict, proceeding with its
operation without any check. This is now fixed.

This test case was built and formalized by Matt Harbison and Anton Shestakov.

--- a/tests/test-stabilize-result.t	Fri Dec 21 19:48:01 2018 +0100
+++ b/tests/test-stabilize-result.t	Fri Dec 21 13:14:59 2018 +0800
@@ -93,7 +93,6 @@
   +a
   +newer a
   $ hg evolve --continue
-  evolving 4:3655f0f50885 "newer a"
   abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
   $ hg resolve -m a