averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nf/mergetool-prompt'

Browse Source 
UI consistency improvements.

* nf/mergetool-prompt:
  difftool/mergetool: make the form of yes/no questions consistent
This commit is contained in:
Junio C Hamano
2016-05-03 14:08:17 -07:00
parent 9b782d297c cce076e371
commit b974143527
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-mergetool.sh
View File

@@ -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]*)