--- a/tests/test-merge-force.t Thu Aug 16 17:19:27 2018 +0200
+++ b/tests/test-merge-force.t Mon Aug 20 13:29:48 2018 -0400
@@ -142,55 +142,80 @@
# 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
- local [working copy] changed content1_missing_content1_content4-tracked which other [merge rev] deleted
+ file content1_missing_content1_content4-tracked was deleted in local [working copy] but was modified in other [merge rev].
+ What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local [working copy] changed content1_missing_content3_content3-tracked which other [merge rev] deleted
+ file content1_missing_content3_content3-tracked was deleted in local [working copy] but was modified in other [merge rev].
+ What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local [working copy] changed content1_missing_content3_content4-tracked which other [merge rev] deleted
+ file content1_missing_content3_content4-tracked was deleted in local [working copy] but was modified in other [merge rev].
+ What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local [working copy] changed content1_missing_missing_content4-tracked which other [merge rev] deleted
+ file content1_missing_missing_content4-tracked was deleted in local [working copy] but was modified in other [merge rev].
+ What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- other [merge rev] changed content1_content2_content1_content1-untracked which local [working copy] deleted
+ file content1_content2_content1_content1-untracked 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
- other [merge rev] changed content1_content2_content1_content2-untracked which local [working copy] deleted
+ file content1_content2_content1_content2-untracked 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
- other [merge rev] changed content1_content2_content1_content4-untracked which local [working copy] deleted
+ file content1_content2_content1_content4-untracked 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
- other [merge rev] changed content1_content2_content1_missing-tracked which local [working copy] deleted
+ file content1_content2_content1_missing-tracked 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
- other [merge rev] changed content1_content2_content1_missing-untracked which local [working copy] deleted
+ file content1_content2_content1_missing-untracked 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
- other [merge rev] changed content1_content2_content2_content1-untracked which local [working copy] deleted
+ file content1_content2_content2_content1-untracked 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
- other [merge rev] changed content1_content2_content2_content2-untracked which local [working copy] deleted
+ file content1_content2_content2_content2-untracked 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
- other [merge rev] changed content1_content2_content2_content4-untracked which local [working copy] deleted
+ file content1_content2_content2_content4-untracked 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
- other [merge rev] changed content1_content2_content2_missing-tracked which local [working copy] deleted
+ file content1_content2_content2_missing-tracked 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
- other [merge rev] changed content1_content2_content2_missing-untracked which local [working copy] deleted
+ file content1_content2_content2_missing-untracked 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
- other [merge rev] changed content1_content2_content3_content1-untracked which local [working copy] deleted
+ file content1_content2_content3_content1-untracked 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
- other [merge rev] changed content1_content2_content3_content2-untracked which local [working copy] deleted
+ file content1_content2_content3_content2-untracked 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
- other [merge rev] changed content1_content2_content3_content3-untracked which local [working copy] deleted
+ file content1_content2_content3_content3-untracked 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
- other [merge rev] changed content1_content2_content3_content4-untracked which local [working copy] deleted
+ file content1_content2_content3_content4-untracked 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
- other [merge rev] changed content1_content2_content3_missing-tracked which local [working copy] deleted
+ file content1_content2_content3_missing-tracked 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
- other [merge rev] changed content1_content2_content3_missing-untracked which local [working copy] deleted
+ file content1_content2_content3_missing-untracked 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
- other [merge rev] changed content1_content2_missing_content1-untracked which local [working copy] deleted
+ file content1_content2_missing_content1-untracked 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
- other [merge rev] changed content1_content2_missing_content2-untracked which local [working copy] deleted
+ file content1_content2_missing_content2-untracked 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
- other [merge rev] changed content1_content2_missing_content4-untracked which local [working copy] deleted
+ file content1_content2_missing_content4-untracked 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
- other [merge rev] changed content1_content2_missing_missing-tracked which local [working copy] deleted
+ file content1_content2_missing_missing-tracked 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
- other [merge rev] changed content1_content2_missing_missing-untracked which local [working copy] deleted
+ file content1_content2_missing_missing-untracked 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 content1_content2_content1_content4-tracked
merging content1_content2_content2_content1-tracked
@@ -703,63 +728,88 @@
(no more unresolved files)
$ hg resolve --unmark --all
$ hg resolve --all --tool internal:merge3
- other [merge rev] changed content1_content2_content1_content1-untracked which local [working copy] deleted
+ file content1_content2_content1_content1-untracked 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
- other [merge rev] changed content1_content2_content1_content2-untracked which local [working copy] deleted
+ file content1_content2_content1_content2-untracked 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 content1_content2_content1_content4-tracked
- other [merge rev] changed content1_content2_content1_content4-untracked which local [working copy] deleted
+ file content1_content2_content1_content4-untracked 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
- other [merge rev] changed content1_content2_content1_missing-tracked which local [working copy] deleted
+ file content1_content2_content1_missing-tracked 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
- other [merge rev] changed content1_content2_content1_missing-untracked which local [working copy] deleted
+ file content1_content2_content1_missing-untracked 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 content1_content2_content2_content1-tracked
- other [merge rev] changed content1_content2_content2_content1-untracked which local [working copy] deleted
+ file content1_content2_content2_content1-untracked 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
- other [merge rev] changed content1_content2_content2_content2-untracked which local [working copy] deleted
+ file content1_content2_content2_content2-untracked 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 content1_content2_content2_content4-tracked
- other [merge rev] changed content1_content2_content2_content4-untracked which local [working copy] deleted
+ file content1_content2_content2_content4-untracked 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
- other [merge rev] changed content1_content2_content2_missing-tracked which local [working copy] deleted
+ file content1_content2_content2_missing-tracked 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
- other [merge rev] changed content1_content2_content2_missing-untracked which local [working copy] deleted
+ file content1_content2_content2_missing-untracked 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 content1_content2_content3_content1-tracked
- other [merge rev] changed content1_content2_content3_content1-untracked which local [working copy] deleted
+ file content1_content2_content3_content1-untracked 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
- other [merge rev] changed content1_content2_content3_content2-untracked which local [working copy] deleted
+ file content1_content2_content3_content2-untracked 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 content1_content2_content3_content3-tracked
- other [merge rev] changed content1_content2_content3_content3-untracked which local [working copy] deleted
+ file content1_content2_content3_content3-untracked 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 content1_content2_content3_content4-tracked
- other [merge rev] changed content1_content2_content3_content4-untracked which local [working copy] deleted
+ file content1_content2_content3_content4-untracked 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
- other [merge rev] changed content1_content2_content3_missing-tracked which local [working copy] deleted
+ file content1_content2_content3_missing-tracked 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
- other [merge rev] changed content1_content2_content3_missing-untracked which local [working copy] deleted
+ file content1_content2_content3_missing-untracked 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 content1_content2_missing_content1-tracked
- other [merge rev] changed content1_content2_missing_content1-untracked which local [working copy] deleted
+ file content1_content2_missing_content1-untracked 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
- other [merge rev] changed content1_content2_missing_content2-untracked which local [working copy] deleted
+ file content1_content2_missing_content2-untracked 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 content1_content2_missing_content4-tracked
- other [merge rev] changed content1_content2_missing_content4-untracked which local [working copy] deleted
+ file content1_content2_missing_content4-untracked 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
- other [merge rev] changed content1_content2_missing_missing-tracked which local [working copy] deleted
+ file content1_content2_missing_missing-tracked 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
- other [merge rev] changed content1_content2_missing_missing-untracked which local [working copy] deleted
+ file content1_content2_missing_missing-untracked 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
- local [working copy] changed content1_missing_content1_content4-tracked which other [merge rev] deleted
+ file content1_missing_content1_content4-tracked was deleted in local [working copy] but was modified in other [merge rev].
+ What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local [working copy] changed content1_missing_content3_content3-tracked which other [merge rev] deleted
+ file content1_missing_content3_content3-tracked was deleted in local [working copy] but was modified in other [merge rev].
+ What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local [working copy] changed content1_missing_content3_content4-tracked which other [merge rev] deleted
+ file content1_missing_content3_content4-tracked was deleted in local [working copy] but was modified in other [merge rev].
+ What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local [working copy] changed content1_missing_missing_content4-tracked which other [merge rev] deleted
+ file content1_missing_missing_content4-tracked was deleted in local [working copy] but was modified in other [merge rev].
+ What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u
merging missing_content2_content2_content4-tracked
merging missing_content2_content3_content3-tracked