diff -r 337443f09fc8 -r f785073f792c tests/test-merge-subrepos.t
--- a/tests/test-merge-subrepos.t	Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-merge-subrepos.t	Mon Aug 20 13:29:48 2018 -0400
@@ -110,7 +110,8 @@
   $ hg up -r '.^' --config ui.interactive=True << EOF
   > d
   > EOF
-  other [destination] changed b which local [working copy] deleted
+  file b was deleted in other [destination] but was modified in local [working copy].
+  What do you want to do?
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved