# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1535561947 -7200
# Node ID 503ae2689df81e19aeb5121d7422b2c5af631f41
# Parent  75e4c451b753e2b0758dcf538c7890d4b0146be0
test: update output after merge message change

CORE-TEST-OUTPUT-UPDATE: f785073f792c
CORE-TEST-OUTPUT-UPDATE: a3fd84f4fb38

diff -r 75e4c451b753 -r 503ae2689df8 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Wed Aug 29 17:32:47 2018 +0200
+++ b/tests/test-prev-next.t	Wed Aug 29 18:59:07 2018 +0200
@@ -460,7 +460,8 @@
 
 XXX: things are broken!
   $ hg prev --merge --config commands.update.check=abort
-  local [working copy] changed bar which other [destination] deleted
+  file 'bar' was deleted in other [destination] but was modified in local [working copy].
+  What do you want to do?
   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