Mercurial > evolve

diff tests/test-prev-next.t @ 4168:8eec9422bd8e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: other harmless output change These are new test that need adjustment for 4.7 output.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 15:07:23 +0200
parents 73f22dc3bbbe
children e268f7fd7839 ab3581bc0637
line wrap: on
line diff
--- a/tests/test-prev-next.t	Fri Oct 12 14:56:00 2018 +0200
+++ b/tests/test-prev-next.t	Fri Oct 12 15:07:23 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