diff -r f3fd3c1c3da0 -r 2928f35023a1 tests/test-evolve-content-divergent-corner-cases.t
--- a/tests/test-evolve-content-divergent-corner-cases.t	Sat Nov 23 20:25:16 2019 +0530
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Sat Nov 23 16:17:04 2019 +0530
@@ -270,45 +270,22 @@
   o  0:9092f1db7931 added a
       () [default] draft
 
-  $ hg evolve --content-divergent --any --update
+  $ hg evolve --content-divergent --any --update --config ui.interactive=true <<EOF
+  > c
+  > EOF
   merge:[5] updated e
   with: [6] updated e
   base: [4] added e
-  rebasing "other" content-divergent changeset de4ea3103326 on 9150fe93bec6
-  merging d
-  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
-  unresolved merge conflicts
-  (see 'hg help evolve.interrupted')
-  [1]
-
-  $ hg diff --no-git --config diff.unified=3
-  diff -r 9150fe93bec6 d
-  --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +1,5 @@
-  +<<<<<<< destination: 9150fe93bec6 - test: added d
-   d
-  +=======
-  +dd
-  +>>>>>>> evolving:    de4ea3103326 - test: updated e
-  diff -r 9150fe93bec6 e
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +ee
-
-  $ echo dresolved > d
-  $ hg res -m
-  (no more unresolved files)
-  continue: hg evolve --continue
-
-  $ hg evolve --continue
-  evolving 6:de4ea3103326 "updated e"
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 83b1664a580f
+  rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be
+  rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be
+  file 'd' was deleted in local but was modified in other.
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? c
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  working directory is now at eb6357cd41b6
 
   $ hg glog -l1
-  @  8:83b1664a580f updated e
+  @  9:eb6357cd41b6 updated e
   |   () [default] draft
   ~