--- a/tests/test-commit-amend.t	Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-commit-amend.t	Mon Aug 20 13:29:48 2018 -0400
@@ -824,7 +824,8 @@
   $ hg merge -q bar --config ui.interactive=True << EOF
   > c
   > EOF
-  local [working copy] changed aa which other [merge rev] deleted
+  file aa was deleted in local [working copy] but was modified in other [merge rev].
+  What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? c
   $ hg ci -m 'merge bar (with conflicts)'
   $ hg log --config diff.git=1 -pr .