parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 5b6278572a48569a806a5a976cdd08eb7c117fb7..b5e1943b1d166b543998c80579c65e82de36516a 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # git-mergetool--lib is a library for common merge tool functions
 diff_mode() {
        test "$TOOL_MODE" = diff
@@ -34,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 ;;