--- a/tests/test-merge-force.t	Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-merge-force.t	Sun Aug 26 19:14:26 2018 +0300
@@ -142,79 +142,79 @@
 #   in the same way, so it could potentially be left alone
 
   $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1
-  file 'content1_missing_content1_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
-  file 'content1_missing_content3_content3-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
-  file 'content1_missing_content3_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
-  file 'content1_missing_missing_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
-  file 'content1_content2_content1_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_content1-untracked' 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
-  file 'content1_content2_content1_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_content2-untracked' 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
-  file 'content1_content2_content1_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_content4-untracked' 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
-  file 'content1_content2_content1_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_missing-tracked' 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
-  file 'content1_content2_content1_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_missing-untracked' 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
-  file 'content1_content2_content2_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_content1-untracked' 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
-  file 'content1_content2_content2_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_content2-untracked' 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
-  file 'content1_content2_content2_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_content4-untracked' 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
-  file 'content1_content2_content2_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_missing-tracked' 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
-  file 'content1_content2_content2_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_missing-untracked' 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
-  file 'content1_content2_content3_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_content1-untracked' 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
-  file 'content1_content2_content3_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_content2-untracked' 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
-  file 'content1_content2_content3_content3-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_content3-untracked' 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
-  file 'content1_content2_content3_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_content4-untracked' 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
-  file 'content1_content2_content3_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_missing-tracked' 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
-  file 'content1_content2_content3_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_missing-untracked' 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
-  file 'content1_content2_missing_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_content1-untracked' 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
-  file 'content1_content2_missing_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_content2-untracked' 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
-  file 'content1_content2_missing_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_content4-untracked' 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
-  file 'content1_content2_missing_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_missing-tracked' 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
-  file 'content1_content2_missing_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_missing-untracked' 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 content1_content2_content1_content4-tracked
@@ -728,87 +728,87 @@
   (no more unresolved files)
   $ hg resolve --unmark --all
   $ hg resolve --all --tool internal:merge3
-  file 'content1_content2_content1_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_content1-untracked' 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
-  file 'content1_content2_content1_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_content2-untracked' 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 content1_content2_content1_content4-tracked
-  file 'content1_content2_content1_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_content4-untracked' 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
-  file 'content1_content2_content1_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_missing-tracked' 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
-  file 'content1_content2_content1_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content1_missing-untracked' 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 content1_content2_content2_content1-tracked
-  file 'content1_content2_content2_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_content1-untracked' 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
-  file 'content1_content2_content2_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_content2-untracked' 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 content1_content2_content2_content4-tracked
-  file 'content1_content2_content2_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_content4-untracked' 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
-  file 'content1_content2_content2_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_missing-tracked' 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
-  file 'content1_content2_content2_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content2_missing-untracked' 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 content1_content2_content3_content1-tracked
-  file 'content1_content2_content3_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_content1-untracked' 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
-  file 'content1_content2_content3_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_content2-untracked' 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 content1_content2_content3_content3-tracked
-  file 'content1_content2_content3_content3-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_content3-untracked' 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 content1_content2_content3_content4-tracked
-  file 'content1_content2_content3_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_content4-untracked' 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
-  file 'content1_content2_content3_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_missing-tracked' 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
-  file 'content1_content2_content3_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_content3_missing-untracked' 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 content1_content2_missing_content1-tracked
-  file 'content1_content2_missing_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_content1-untracked' 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
-  file 'content1_content2_missing_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_content2-untracked' 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 content1_content2_missing_content4-tracked
-  file 'content1_content2_missing_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_content4-untracked' 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
-  file 'content1_content2_missing_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_missing-tracked' 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
-  file 'content1_content2_missing_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy].
+  file 'content1_content2_missing_missing-untracked' 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
-  file 'content1_missing_content1_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
-  file 'content1_missing_content3_content3-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
-  file 'content1_missing_content3_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
-  file 'content1_missing_missing_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+  file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
   What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? u
   merging missing_content2_content2_content4-tracked