diff -r 55580b0b2b77 -r 2631e735ec16 tests/test-evolve-content-divergent-corner-cases.t
--- a/tests/test-evolve-content-divergent-corner-cases.t	Thu Jan 23 17:40:56 2020 +0700
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Thu Jan 23 17:40:57 2020 +0700
@@ -278,8 +278,7 @@
   base: [4] added e
   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.
-  What do you want to do?
+  other changed d which local deleted
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at eb6357cd41b6