--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Jun 05 17:39:32 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Jun 05 17:42:50 2019 +0200
@@ -415,8 +415,7 @@
 
   $ hg evolve --continue
   evolving 4:e568fd1029bb "added c e"
-  file 'd' was deleted in other but was modified in local.
-  What do you want to do?
+  local changed d which other deleted
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   fix conflicts and see `hg help evolve.interrupted`