diff -r 7091f7215651 -r 8eec9422bd8e tests/test-prev-next.t
--- a/tests/test-prev-next.t	Fri Oct 12 14:56:00 2018 +0200
+++ b/tests/test-prev-next.t	Fri Oct 12 15:07:23 2018 +0200
@@ -460,8 +460,7 @@
 
 XXX: things are broken!
   $ hg prev --merge --config commands.update.check=abort
-  file 'bar' was deleted in other [destination] but was modified in local [working copy].
-  What do you want to do?
+  local [working copy] changed bar which other [destination] deleted
   use (c)hanged version, (d)elete, or leave (u)nresolved? 
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges