diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-03 23:08:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-03 23:08:17 +0200 |
| commit | b97414352746967c72e5b87cce39efea4b93e2bf (patch) | |
| tree | 2737978df20165cd0149efde1ed35cca7e2611e8 /git-mergetool--lib.sh | |
| parent | Merge branch 'jd/send-email-to-whom' (diff) | |
| parent | difftool/mergetool: make the form of yes/no questions consistent (diff) | |
| download | git-b97414352746967c72e5b87cce39efea4b93e2bf.tar.xz git-b97414352746967c72e5b87cce39efea4b93e2bf.zip | |
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--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 302c56de5b..9abd00be21 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -100,7 +100,7 @@ check_unchanged () { while true do echo "$MERGED seems unchanged." - printf "Was the merge successful? [y/n] " + printf "Was the merge successful [y/n]? " read answer || return 1 case "$answer" in y*|Y*) return 0 ;; |