diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:07 -0700 |
| commit | f735a50ffdf0e1734438f0c0e6d70c4a81eea09e (patch) | |
| tree | 50aca0214a8e441ef3d67b08f8d38a9226e8c851 /git-mergetool.sh | |
| parent | 1f7b196e2181c4d23959193327941ee4e065748c (diff) | |
| parent | cce076e37107217faa942dddc20e79ae7350bc1f (diff) | |
| download | git-f735a50ffdf0e1734438f0c0e6d70c4a81eea09e.tar.gz | |
Merge branch 'nf/mergetool-prompt' into HEAD
UI consistency improvements.
* nf/mergetool-prompt:
difftool/mergetool: make the form of yes/no questions consistent
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index f67bab55e8..bf862705d8 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]*) |