# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1535988028 -7200
# Node ID 12c29a0fb4721fa99163c571d12284517ed41854
# Parent  c53bf38e2e5a1461ab672fbe89317ae3d4ad12dd
test-output: backout test output update in 503ae2689df8

diff -r c53bf38e2e5a -r 12c29a0fb472 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Mon Sep 03 20:54:17 2018 +0200
+++ b/tests/test-prev-next.t	Mon Sep 03 17:20:28 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