Mercurial > evolve

changeset 4043:503ae2689df8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update output after merge message change CORE-TEST-OUTPUT-UPDATE: f785073f792c CORE-TEST-OUTPUT-UPDATE: a3fd84f4fb38
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 29 Aug 2018 18:59:07 +0200
parents 75e4c451b753
children c0fbe70f2e48
files tests/test-prev-next.t
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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