--- a/tests/test-merge-force.t Fri Aug 12 06:01:42 2016 -0700
+++ b/tests/test-merge-force.t Fri Aug 12 05:56:40 2016 -0700
@@ -142,55 +142,55 @@
# 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 changed content1_missing_content1_content4-tracked which remote deleted
+ local changed content1_missing_content1_content4-tracked which other deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local changed content1_missing_content3_content3-tracked which remote deleted
+ local changed content1_missing_content3_content3-tracked which other deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local changed content1_missing_content3_content4-tracked which remote deleted
+ local changed content1_missing_content3_content4-tracked which other deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local changed content1_missing_missing_content4-tracked which remote deleted
+ local changed content1_missing_missing_content4-tracked which other deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- remote changed content1_content2_content1_content1-untracked which local deleted
+ other changed content1_content2_content1_content1-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content1_content2-untracked which local deleted
+ other changed content1_content2_content1_content2-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content1_content4-untracked which local deleted
+ other changed content1_content2_content1_content4-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content1_missing-tracked which local deleted
+ other changed content1_content2_content1_missing-tracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content1_missing-untracked which local deleted
+ other changed content1_content2_content1_missing-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content2_content1-untracked which local deleted
+ other changed content1_content2_content2_content1-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content2_content2-untracked which local deleted
+ other changed content1_content2_content2_content2-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content2_content4-untracked which local deleted
+ other changed content1_content2_content2_content4-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content2_missing-tracked which local deleted
+ other changed content1_content2_content2_missing-tracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content2_missing-untracked which local deleted
+ other changed content1_content2_content2_missing-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_content1-untracked which local deleted
+ other changed content1_content2_content3_content1-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_content2-untracked which local deleted
+ other changed content1_content2_content3_content2-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_content3-untracked which local deleted
+ other changed content1_content2_content3_content3-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_content4-untracked which local deleted
+ other changed content1_content2_content3_content4-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_missing-tracked which local deleted
+ other changed content1_content2_content3_missing-tracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_missing-untracked which local deleted
+ other changed content1_content2_content3_missing-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_missing_content1-untracked which local deleted
+ other changed content1_content2_missing_content1-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_missing_content2-untracked which local deleted
+ other changed content1_content2_missing_content2-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_missing_content4-untracked which local deleted
+ other changed content1_content2_missing_content4-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_missing_missing-tracked which local deleted
+ other changed content1_content2_missing_missing-tracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_missing_missing-untracked which local deleted
+ other changed content1_content2_missing_missing-untracked which local deleted
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 +703,63 @@
(no more unresolved files)
$ hg resolve --unmark --all
$ hg resolve --all --tool internal:merge3
- remote changed content1_content2_content1_content1-untracked which local deleted
+ other changed content1_content2_content1_content1-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content1_content2-untracked which local deleted
+ other changed content1_content2_content1_content2-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content1_content4-tracked
- remote changed content1_content2_content1_content4-untracked which local deleted
+ other changed content1_content2_content1_content4-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content1_missing-tracked which local deleted
+ other changed content1_content2_content1_missing-tracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content1_missing-untracked which local deleted
+ other changed content1_content2_content1_missing-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content2_content1-tracked
- remote changed content1_content2_content2_content1-untracked which local deleted
+ other changed content1_content2_content2_content1-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content2_content2-untracked which local deleted
+ other changed content1_content2_content2_content2-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content2_content4-tracked
- remote changed content1_content2_content2_content4-untracked which local deleted
+ other changed content1_content2_content2_content4-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content2_missing-tracked which local deleted
+ other changed content1_content2_content2_missing-tracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content2_missing-untracked which local deleted
+ other changed content1_content2_content2_missing-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content1-tracked
- remote changed content1_content2_content3_content1-untracked which local deleted
+ other changed content1_content2_content3_content1-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_content2-untracked which local deleted
+ other changed content1_content2_content3_content2-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content3-tracked
- remote changed content1_content2_content3_content3-untracked which local deleted
+ other changed content1_content2_content3_content3-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content4-tracked
- remote changed content1_content2_content3_content4-untracked which local deleted
+ other changed content1_content2_content3_content4-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_missing-tracked which local deleted
+ other changed content1_content2_content3_missing-tracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_content3_missing-untracked which local deleted
+ other changed content1_content2_content3_missing-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_missing_content1-tracked
- remote changed content1_content2_missing_content1-untracked which local deleted
+ other changed content1_content2_missing_content1-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_missing_content2-untracked which local deleted
+ other changed content1_content2_missing_content2-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_missing_content4-tracked
- remote changed content1_content2_missing_content4-untracked which local deleted
+ other changed content1_content2_missing_content4-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_missing_missing-tracked which local deleted
+ other changed content1_content2_missing_missing-tracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- remote changed content1_content2_missing_missing-untracked which local deleted
+ other changed content1_content2_missing_missing-untracked which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
- local changed content1_missing_content1_content4-tracked which remote deleted
+ local changed content1_missing_content1_content4-tracked which other deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local changed content1_missing_content3_content3-tracked which remote deleted
+ local changed content1_missing_content3_content3-tracked which other deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local changed content1_missing_content3_content4-tracked which remote deleted
+ local changed content1_missing_content3_content4-tracked which other deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
- local changed content1_missing_missing_content4-tracked which remote deleted
+ local changed content1_missing_missing_content4-tracked which other deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
merging missing_content2_content2_content4-tracked
merging missing_content2_content3_content3-tracked