Mercurial > evolve

changeset 4071:12c29a0fb472 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-output: backout test output update in 503ae2689df8
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 17:20:28 +0200
parents c53bf38e2e5a
children 13d8a2d559bd
files tests/test-prev-next.t
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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