aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-03 14:08:17 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-03 14:08:17 -0700
commitb97414352746967c72e5b87cce39efea4b93e2bf (patch)
tree2737978df20165cd0149efde1ed35cca7e2611e8 /git-mergetool.sh
parent9b782d297c141cc45973c8b455cc93495d86b277 (diff)
parentcce076e37107217faa942dddc20e79ae7350bc1f (diff)
downloadgit-b97414352746967c72e5b87cce39efea4b93e2bf.tar.gz
git-b97414352746967c72e5b87cce39efea4b93e2bf.tar.xz
Merge branch 'nf/mergetool-prompt'
UI consistency improvements. * nf/mergetool-prompt: difftool/mergetool: make the form of yes/no questions consistent
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 f67bab55e..bf862705d 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -413,7 +413,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]*)