X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-mergetool--lib.sh;h=b5e1943b1d166b543998c80579c65e82de36516a;hb=06f44c3cc5ca5eca638f300a518c65aa98d26d6d;hp=51dd0d67ba951873df4f26b1707a1e8a713082b9;hpb=9e2b8857413127ae200735fa004bd445b2c8ca61;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 ;;