diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -56,13 +56,13 @@ mergeonly = internaltool.mergeonly # jus
fullmerge = internaltool.fullmerge # both premerge and merge
_localchangedotherdeletedmsg = _(
- "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
+ "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
"What do you want to do?\n"
"use (c)hanged version, (d)elete, or leave (u)nresolved?"
"$$ &Changed $$ &Delete $$ &Unresolved")
_otherchangedlocaldeletedmsg = _(
- "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
+ "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
"What do you want to do?\n"
"use (c)hanged version, leave (d)eleted, or "
"leave (u)nresolved?"
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -824,7 +824,7 @@ Amend a merge changeset (with manifest-l
$ hg merge -q bar --config ui.interactive=True << EOF
> c
> EOF
- file 'aa' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'aa' 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? c
$ hg ci -m 'merge bar (with conflicts)'
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -88,7 +88,7 @@ Test disabling copy tracing
> c
> EOF
rebasing 2:add3f11052fa "other" (tip)
- file 'a' was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
diff --git a/tests/test-copytrace-heuristics.t b/tests/test-copytrace-heuristics.t
--- a/tests/test-copytrace-heuristics.t
+++ b/tests/test-copytrace-heuristics.t
@@ -86,7 +86,7 @@ Make sure filename heuristics do not whe
$ hg rebase -s . -d 1
rebasing 2:d526312210b9 "mode a" (tip)
- file 'a' was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -243,7 +243,7 @@ With small limit
$ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
rebasing 2:ef716627c70b "mod a" (tip)
skipping copytracing for 'a', more candidates than the limit: 7
- file 'a' was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
@@ -699,7 +699,7 @@ When the sourcecommitlimit is small and
$ hg rebase -s 8b6e13696 -d .
rebasing 1:8b6e13696c38 "added more things to a"
- file 'a' was deleted in other [source] but was modified in local [dest].
+ file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -611,7 +611,7 @@ the 1st commit of resuming.
> EOF
rebasing 1:72518492caa6 "#1"
rebasing 4:07d6153b5c04 "#4"
- file '.hglf/large1' was deleted in local [dest] but was modified in other [source].
+ file '.hglf/large1' was deleted in other [source] but was modified in local [dest].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? c
diff --git a/tests/test-merge-changedelete.t b/tests/test-merge-changedelete.t
--- a/tests/test-merge-changedelete.t
+++ b/tests/test-merge-changedelete.t
@@ -54,10 +54,10 @@ Make sure HGMERGE doesn't interfere with
Non-interactive merge:
$ hg merge -y
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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 file3
@@ -123,10 +123,10 @@ Interactive merge:
> c
> d
> EOF
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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? c
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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? d
merging file3
@@ -193,22 +193,22 @@ Interactive merge with bad input:
> baz
> c
> EOF
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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? foo
unrecognized response
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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? bar
unrecognized response
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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? d
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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? baz
unrecognized response
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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? c
merging file3
@@ -271,10 +271,10 @@ Interactive merge with not enough input:
$ hg merge --config ui.interactive=true <<EOF
> d
> EOF
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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? d
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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?
merging file3
@@ -484,10 +484,10 @@ Force prompts with no input (should be s
1 other heads for branch "default"
$ hg merge --config ui.interactive=True --tool :prompt
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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?
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
@@ -545,10 +545,10 @@ Force prompts
1 other heads for branch "default"
$ hg merge --tool :prompt
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u
@@ -604,10 +604,10 @@ Choose to merge all files
1 other heads for branch "default"
$ hg merge --tool :merge3
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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 file3
@@ -696,10 +696,10 @@ invocations.)
(status identical)
=== :other -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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?
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
@@ -726,10 +726,10 @@ invocations.)
(status identical)
=== :local -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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?
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
@@ -746,10 +746,10 @@ invocations.)
(status identical)
=== :fail -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'file1' 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?
- file 'file2' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'file2' 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?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
@@ -774,10 +774,10 @@ Non-interactive linear update
$ echo changed >> file1
$ hg rm file2
$ hg update 1 -y
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] 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 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
@@ -952,10 +952,10 @@ Force prompts with no input
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --config ui.interactive=True --tool :prompt
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
@@ -1004,10 +1004,10 @@ Choose to merge all files
$ echo changed >> file1
$ hg rm file2
$ hg update 1 --tool :merge3
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] 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 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
@@ -1062,10 +1062,10 @@ Test transitions between different merge
(status identical)
=== :other -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
@@ -1091,10 +1091,10 @@ Test transitions between different merge
(status identical)
=== :local -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
@@ -1110,10 +1110,10 @@ Test transitions between different merge
(status identical)
=== :fail -> :prompt ===
- file 'file1' was deleted in local [working copy] but was modified in other [destination].
+ file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
- file 'file2' was deleted in other [destination] but was modified in local [working copy].
+ file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status ---
diff --git a/tests/test-merge-force.t b/tests/test-merge-force.t
--- a/tests/test-merge-force.t
+++ b/tests/test-merge-force.t
@@ -142,79 +142,79 @@ Merge with remote
# 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 @@ Re-resolve and check status
(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
diff --git a/tests/test-merge-remove.t b/tests/test-merge-remove.t
--- a/tests/test-merge-remove.t
+++ b/tests/test-merge-remove.t
@@ -102,7 +102,7 @@ Merge should not overwrite local file th
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
diff --git a/tests/test-merge-subrepos.t b/tests/test-merge-subrepos.t
--- a/tests/test-merge-subrepos.t
+++ b/tests/test-merge-subrepos.t
@@ -110,7 +110,7 @@ missing file in the top level repo.
$ hg up -r '.^' --config ui.interactive=True << EOF
> d
> EOF
- file 'b' was deleted in other [destination] but was modified in local [working copy].
+ file 'b' was deleted in local [working copy] but was modified in other [destination].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@@ -133,7 +133,7 @@ Full rebase all the way back from branch
note: rebase of 1:1d1a643d390e created no changes to commit
rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default"
- file 'f-default' was deleted in other [source] but was modified in local [dest].
+ file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
@@ -163,7 +163,7 @@ Grafty cherry picking rebasing:
> EOF
rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default"
- file 'f-default' was deleted in other [source] but was modified in local [dest].
+ file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
rebasing 6:9455ee510502 "dev: merge default"
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -692,7 +692,7 @@ m "um a c" "um x c" " " "10 do merg
starting 4 threads for background file closing (?)
a: prompt deleted/changed -> m (premerge)
picked tool ':prompt' for a (binary False symlink False changedelete True)
- file 'a' was deleted in other [merge rev] but was modified in local [working copy].
+ file 'a' 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
b: both created -> m (premerge)
@@ -738,7 +738,7 @@ m "um a c" "um x c" " " "10 do merg
starting 4 threads for background file closing (?)
a: prompt changed/deleted -> m (premerge)
picked tool ':prompt' for a (binary False symlink False changedelete True)
- file 'a' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'a' 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
b: both created -> m (premerge)
diff --git a/tests/test-sparse-merges.t b/tests/test-sparse-merges.t
--- a/tests/test-sparse-merges.t
+++ b/tests/test-sparse-merges.t
@@ -113,7 +113,7 @@ file is excluded from sparse checkout
$ hg merge
temporarily included 1 file(s) in the sparse checkout for merging
- file 'd' was deleted in local [working copy] but was modified in other [merge rev].
+ file 'd' 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
0 files updated, 0 files merged, 0 files removed, 1 files unresolved