Mercurial > evolve

diff tests/test-prev-next.t @ 4195:4803bfe8db17 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: backed out changeset 8eec9422bd8e Preparing the branch for 4.8.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 25 Oct 2018 12:52:34 +0200
parents 8eec9422bd8e
children f555039d1a08 9e64a7d09895
line wrap: on
line diff
--- a/tests/test-prev-next.t	Sun Oct 21 00:08:27 2018 +0300
+++ b/tests/test-prev-next.t	Thu Oct 25 12:52:34 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