Commit 629ae12e authored by Kyle Lippincott's avatar Kyle Lippincott
Browse files

filemerge: make last line of prompts <40 english chars (issue6158)

I've chosen <40 as the target so that other languages that may have a 2x blowup
in character count can still have a chance to fit into an 80 column screen.

Previously, we would show a prompt like:

```
keep (l)ocal [dest], take (o)ther [source], or leave (u)nresolved for some/potentially/really/long/path?
```

On at least some systems, if readline was in use then the last line of the
prompt would be wrapped strangely if it couldn't fit entirely on one line. This
strange wrapping may be just a carriage return without a line feed, overwriting
the beginning of the line; example (100 columns wide, 65 character filename, and
yes there's 10 spaces on the end, I assume this is to handle the user inputting
longest word we provide as an option, "unresolved"):

```
ng/dir/name/that/does/not/work/well/with/readline/file.txt? ave (u)nresolved for some/lon
```

In some cases it may partially wrap onto the next line, but still be missing
earlier parts in the line, such as below (60 columns wide, 65 character
filename):

```
 rev], or leave (u)nresolved for some/long/dir/name/that/do
s/not/work/well/with/readline/file.txt?
```

With this fix, this looks like this on a 60 column screen:

```
tool vim_with_markers (for pattern some/long/dir/name/that/d
oes/not/work/well/with/readline/file.txt) can't handle binar
y
tool meld can't handle binary
tool vim_with_markers can't handle binary
tool internal:merge3 can't handle binary
tool merge can't handle binary
no tool found to merge some/long/dir/name/that/does/not/work
/well/with/readline/file.txt
file 'some/long/dir/name/that/does/not/work/well/with/readli
ne/file.txt' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev
], or leave (u)nresolved.
What do you want to do?
```

Differential Revision: https://phab.mercurial-scm.org/D6562
parent 44e99811bea7
......@@ -60,17 +60,20 @@ nomerge = internaltool.nomerge
mergeonly = internaltool.mergeonly # just the full merge, no premerge
fullmerge = internaltool.fullmerge # both premerge and merge
# IMPORTANT: keep the last line of this prompt very short ("What do you want to
# do?") because of issue6158, ideally to <40 English characters (to allow other
# languages that may take more columns to still have a chance to fit in an
# 80-column screen).
_localchangedotherdeletedmsg = _(
"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?"
"You can use (c)hanged version, (d)elete, or leave (u)nresolved.\n"
"What do you want to do?"
"$$ &Changed $$ &Delete $$ &Unresolved")
_otherchangedlocaldeletedmsg = _(
"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?"
"You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.\n"
"What do you want to do?"
"$$ &Changed $$ &Deleted $$ &Unresolved")
class absentfilectx(object):
......@@ -299,9 +302,14 @@ def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
_otherchangedlocaldeletedmsg % prompts, 2)
choice = ['other', 'local', 'unresolved'][index]
else:
# IMPORTANT: keep the last line of this prompt ("What do you want to
# do?") very short, see comment next to _localchangedotherdeletedmsg
# at the top of the file for details.
index = ui.promptchoice(
_("keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved"
" for %(fd)s?"
_("file '%(fd)s' needs to be resolved.\n"
"You can keep (l)ocal%(l)s, take (o)ther%(o)s, or leave "
"(u)nresolved.\n"
"What do you want to do?"
"$$ &Local $$ &Other $$ &Unresolved") % prompts, 2)
choice = ['local', 'other', 'unresolved'][index]
......
......@@ -789,8 +789,8 @@ in p1 too, but it was recorded as copied from p2.
$ echo modified >> aaa
$ hg co -m '.^' -t :merge3
file 'aaa' 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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
1 files updated, 0 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
......@@ -839,8 +839,8 @@ Amend a merge changeset (with manifest-level conflicts):
> c
> EOF
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? c
$ hg ci -m 'merge bar (with conflicts)'
$ hg log --config diff.git=1 -pr .
changeset: 28:b4c3035e2544
......
......@@ -88,8 +88,8 @@ Test disabling copy tracing
> EOF
rebasing 2:add3f11052fa "other" (tip)
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? c
$ cat b
1
......
......@@ -89,8 +89,8 @@ Make sure filename heuristics do not when they are not related
$ hg rebase -s . -d 1
rebasing 2:d526312210b9 "mode a" (tip)
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
......@@ -246,8 +246,8 @@ With small limit
rebasing 2:ef716627c70b "mod a" (tip)
skipping copytracing for 'a', more candidates than the limit: 7
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
......@@ -702,8 +702,8 @@ When the sourcecommitlimit is small and we have more drafts, we use heuristics o
$ hg rebase -s 1 -d .
rebasing 1:8b6e13696c38 "added more things to a"
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
......
......@@ -612,8 +612,8 @@ the 1st commit of resuming.
rebasing 1:72518492caa6 "#1"
rebasing 4:07d6153b5c04 "#4"
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? c
$ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]'
-e5bb990443d6a92aaf7223813720f7566c9dd05b
......
......@@ -128,7 +128,9 @@ add some changesets to rename/remove/merge
$ hg merge
tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary
no tool found to merge stuff/maybelarge.dat
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for stuff/maybelarge.dat? u
file 'stuff/maybelarge.dat' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
merging sub/normal2 and stuff/normal2 to stuff/normal2
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
......
......@@ -55,11 +55,11 @@ Non-interactive merge:
$ hg merge -y
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
......@@ -124,11 +124,11 @@ Interactive merge:
> d
> EOF
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? c
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? d
merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 2 files merged, 0 files removed, 1 files unresolved
......@@ -194,23 +194,23 @@ Interactive merge with bad input:
> c
> EOF
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? foo
unrecognized response
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? bar
unrecognized response
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? d
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? baz
unrecognized response
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? c
merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 1 files merged, 1 files removed, 1 files unresolved
......@@ -272,11 +272,11 @@ Interactive merge with not enough input:
> d
> EOF
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? d
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 1 files removed, 2 files unresolved
......@@ -485,12 +485,14 @@ Force prompts with no input (should be similar to :fail)
$ hg merge --config ui.interactive=True --tool :prompt
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?
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
......@@ -546,12 +548,14 @@ Force prompts
$ hg merge --tool :prompt
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
......@@ -605,11 +609,11 @@ Choose to merge all files
$ hg merge --tool :merge3
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
......@@ -697,12 +701,14 @@ invocations.)
=== :other -> :prompt ===
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?
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
......@@ -727,12 +733,14 @@ invocations.)
=== :local -> :prompt ===
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?
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
......@@ -747,12 +755,14 @@ invocations.)
=== :fail -> :prompt ===
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?
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
......@@ -775,11 +785,11 @@ Non-interactive linear update
$ hg rm file2
$ hg update 1 -y
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
......@@ -953,11 +963,11 @@ Force prompts with no input
$ hg rm file2
$ hg update 1 --config ui.interactive=True --tool :prompt
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?
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
......@@ -1005,11 +1015,11 @@ Choose to merge all files
$ hg rm file2
$ hg update 1 --tool :merge3
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
......@@ -1063,11 +1073,11 @@ Test transitions between different merge tools
=== :other -> :prompt ===
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?
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
......@@ -1092,11 +1102,11 @@ Test transitions between different merge tools
=== :local -> :prompt ===
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?
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
......@@ -1111,11 +1121,11 @@ Test transitions between different merge tools
=== :fail -> :prompt ===
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?
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do?
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?
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
--- diff of status ---
(status identical)
......
......@@ -143,80 +143,80 @@ Merge with remote
$ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
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
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
merging content1_content2_content1_content4-tracked
merging content1_content2_content2_content1-tracked
merging content1_content2_content2_content4-tracked
......@@ -729,88 +729,88 @@ Re-resolve and check status
$ hg resolve --unmark --all
$ hg resolve --all --tool internal:merge3