--- a/tests/test-merge-remove.t	Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-merge-remove.t	Sun Aug 26 19:14:26 2018 +0300
@@ -102,7 +102,7 @@
 Those who use force will lose
 
   $ hg merge -f
-  file 'bar' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'bar' was deleted in local [working copy] but was modified in other [merge rev].
   What do you want to do?
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
   merging foo1 and foo to foo1