diff options
| author | Nikola Forró <nforro@redhat.com> | 2016-04-12 16:44:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 15:15:17 -0700 |
| commit | cce076e37107217faa942dddc20e79ae7350bc1f (patch) | |
| tree | 75c4cfa723fddad28349318907bf2ec8a39b8633 /git-mergetool--lib.sh | |
| parent | e46579643d56162299b1756b70d418005351b256 (diff) | |
| download | git-cce076e37107217faa942dddc20e79ae7350bc1f.tar.gz git-cce076e37107217faa942dddc20e79ae7350bc1f.tar.xz | |
difftool/mergetool: make the form of yes/no questions consistent
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--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 54ac8e484..92adcc0d0 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 ;; |