--- a/tests/test-merge-tools.t Wed Nov 25 14:25:26 2015 -0800
+++ b/tests/test-merge-tools.t Mon Nov 30 11:17:18 2015 -0800
@@ -532,7 +532,7 @@
# hg update -C 1
$ hg merge -r 2 --config ui.merge=internal:prompt
no tool found to merge f
- keep (l)ocal or take (o)ther? l
+ keep (l)ocal, take (o)ther, or leave (u)nresolved? l
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ aftermerge
@@ -544,6 +544,31 @@
# hg resolve --list
R f
+ui.merge specifies :prompt, with 'leave unresolved' chosen
+
+ $ beforemerge
+ [merge-tools]
+ false.whatever=
+ true.priority=1
+ true.executable=cat
+ # hg update -C 1
+ $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF
+ > u
+ > EOF
+ no tool found to merge f
+ keep (l)ocal, take (o)ther, or leave (u)nresolved? u
+ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+ [1]
+ $ aftermerge
+ # cat f
+ revision 1
+ space
+ # hg stat
+ M f
+ # hg resolve --list
+ U f
+
prompt with EOF
$ beforemerge
@@ -554,7 +579,7 @@
# hg update -C 1
$ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
no tool found to merge f
- keep (l)ocal or take (o)ther?
+ keep (l)ocal, take (o)ther, or leave (u)nresolved?
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
@@ -568,7 +593,7 @@
U f
$ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
no tool found to merge f
- keep (l)ocal or take (o)ther?
+ keep (l)ocal, take (o)ther, or leave (u)nresolved?
[1]
$ aftermerge
# cat f
@@ -582,7 +607,7 @@
$ rm f
$ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
no tool found to merge f
- keep (l)ocal or take (o)ther?
+ keep (l)ocal, take (o)ther, or leave (u)nresolved?
[1]
$ aftermerge
# cat f
@@ -594,7 +619,7 @@
U f
$ hg resolve --all --config ui.merge=internal:prompt
no tool found to merge f
- keep (l)ocal or take (o)ther? l
+ keep (l)ocal, take (o)ther, or leave (u)nresolved? l
(no more unresolved files)
$ aftermerge
# cat f