X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-mergetool--lib.sh;h=b5e1943b1d166b543998c80579c65e82de36516a;hb=9037026d34907c0c94e3ab46f96068fa57da6ebc;hp=51dd0d67ba951873df4f26b1707a1e8a713082b9;hpb=28bf4ba014c9b41679f41580fa9e1cc294b240d9;p=git.git diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 51dd0d67b..b5e1943b1 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -35,7 +35,7 @@ check_unchanged () { while true; do echo "$MERGED seems unchanged." printf "Was the merge successful? [y/n] " - read answer < /dev/tty + read answer case "$answer" in y*|Y*) status=0; break ;; n*|N*) status=1; break ;;