diff tests/test-evolve-abort-phasediv.t @ 5747:8e4f6354b316 mercurial-5.6

tests: back out changeset b3d9e6c805d6

--- a/tests/test-evolve-abort-phasediv.t	Sat Jan 30 20:21:19 2021 +0800
+++ b/tests/test-evolve-abort-phasediv.t	Thu Jan 28 18:48:36 2021 +0800
@@ -97,7 +97,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
 testing that interrupted evolve shows up in morestatus
   $ hg status -v
@@ -216,7 +216,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg abort
   1 new phase-divergent changesets
@@ -286,7 +286,7 @@
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ echo watwat > c
   $ hg resolve -m
@@ -302,7 +302,7 @@
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
-  [240]
+  [1]
 
   $ hg abort
   1 new phase-divergent changesets