diff options
| author | Nikola Forró <nforro@redhat.com> | 2016-04-12 16:44:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 15:15:17 -0700 |
| commit | cce076e37107217faa942dddc20e79ae7350bc1f (patch) | |
| tree | 75c4cfa723fddad28349318907bf2ec8a39b8633 /git-difftool--helper.sh | |
| parent | e46579643d56162299b1756b70d418005351b256 (diff) | |
| download | git-cce076e37107217faa942dddc20e79ae7350bc1f.tar.gz | |
difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-prompt
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>
Diffstat (limited to 'git-difftool--helper.sh')
| -rwxr-xr-x | git-difftool--helper.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 2b11b1d6fe..84d6cc021c 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -44,10 +44,10 @@ launch_merge_tool () { "$GIT_DIFF_PATH_TOTAL" "$MERGED" if use_ext_cmd then - printf "Launch '%s' [Y/n]: " \ + printf "Launch '%s' [Y/n]? " \ "$GIT_DIFFTOOL_EXTCMD" else - printf "Launch '%s' [Y/n]: " "$merge_tool" + printf "Launch '%s' [Y/n]? " "$merge_tool" fi read ans || return if test "$ans" = n |