--- a/tests/test-merge-remove.t Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-merge-remove.t Mon Aug 20 13:29:48 2018 -0400
@@ -102,7 +102,8 @@
Those who use force will lose
$ hg merge -f
- other [merge rev] changed bar which local [working copy] deleted
+ file bar was deleted in other [merge rev] but was modified in local [working copy].
+ What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging foo1 and foo to foo1
0 files updated, 1 files merged, 0 files removed, 1 files unresolved