difftool/mergetool: make the form of yes/no questions consistent
Every yes/no question in difftool/mergetool scripts has slightly different form, and none of them is consistent with the form git itself uses. Make the form of all the questions consistent with the form used by git. Reviewed-by: John Keeping <john@keeping.me.uk> Signed-off-by: Nikola Forró <nforro@redhat.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nikola Forró committed
Apr 12, 2016 at 16:44 UTC
cce076e37107217faa942dddc20e79ae7350bc1f
4 files changed
+5
-5
git-difftool--helper.sh
+2
-2
@@ -44,10 +44,10 @@ launch_merge_tool () {
44
"$GIT_DIFF_PATH_TOTAL" "$MERGED"
45
if use_ext_cmd
46
then
47
- printf "Launch '%s' [Y/n]: " \
47
+ printf "Launch '%s' [Y/n]? " \
48
"$GIT_DIFFTOOL_EXTCMD"
49
else
50
- printf "Launch '%s' [Y/n]: " "$merge_tool"
50
+ printf "Launch '%s' [Y/n]? " "$merge_tool"
51
fi
52
read ans || return
53
if test "$ans" = n
git-mergetool--lib.sh
+1
-1
@@ -100,7 +100,7 @@ check_unchanged () {
100
while true
101
do
102
echo "$MERGED seems unchanged."
103
- printf "Was the merge successful? [y/n] "
103
+ printf "Was the merge successful [y/n]? "
104
read answer || return 1
105
case "$answer" in
106
y*|Y*) return 0 ;;
git-mergetool.sh
+1
-1
@@ -396,7 +396,7 @@ done
396
prompt_after_failed_merge () {
397
while true
398
do
399
- printf "Continue merging other unresolved paths (y/n) ? "
399
+ printf "Continue merging other unresolved paths [y/n]? "
400
read ans || return 1
401
case "$ans" in
402
[yY]*)
t/t7800-difftool.sh
+1
-1
@@ -20,7 +20,7 @@ difftool_test_setup ()
20
prompt_given ()
21
{
22
prompt="$1"
23
- test "$prompt" = "Launch 'test-tool' [Y/n]: branch"
23
+ test "$prompt" = "Launch 'test-tool' [Y/n]? branch"
24
}
25
26
# Create a file on master and change it on branch