--- a/tests/test-prev-next.t Wed Jun 05 17:39:32 2019 +0200
+++ b/tests/test-prev-next.t Wed Jun 05 17:42:50 2019 +0200
@@ -469,8 +469,7 @@
(do you want --merge?)
[255]
$ 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