Merge branch 'jk/no-textconv-symlink' into maint

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 51dd0d67ba951873df4f26b1707a1e8a713082b9..b5e1943b1d166b543998c80579c65e82de36516a 100644 (file)
--- 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 ;;