summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorNikola Forró <nforro@redhat.com>2016-04-12 16:44:20 +0200
committerJunio C Hamano <gitster@pobox.com>2016-04-25 15:15:17 -0700
commitcce076e37107217faa942dddc20e79ae7350bc1f (patch)
tree75c4cfa723fddad28349318907bf2ec8a39b8633 /git-mergetool.sh
parente46579643d56162299b1756b70d418005351b256 (diff)
downloadgit-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-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 9f77e3a8bb..2e0635a15c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -396,7 +396,7 @@ done
prompt_after_failed_merge () {
while true
do
- printf "Continue merging other unresolved paths (y/n) ? "
+ printf "Continue merging other unresolved paths [y/n]? "
read ans || return 1
case "$ans" in
[yY]*)