Merge branch 'cb/maint-mergetool-no-tty'

* cb/maint-mergetool-no-tty:
  mergetool: Remove explicit references to /dev/tty

Conflicts:
	git-mergetool.sh

2 files changed, 7 insertions, 3 deletions

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 ;;
diff --git a/git-mergetool.sh b/git-mergetool.sh
index bd7ab02f1..2f8dc441c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -289,6 +289,10 @@ if test $# -eq 0 ; then
 	echo "No files need merging"
 	exit 0
     fi
+
+    # Save original stdin
+    exec 3<&0
+
     printf "Merging:\n"
     printf "$files\n"
 
@@ -296,10 +300,10 @@ if test $# -eq 0 ; then
     while IFS= read i
     do
 	if test $last_status -ne 0; then
-	    prompt_after_failed_merge < /dev/tty || exit 1
+	    prompt_after_failed_merge <&3 || exit 1
 	fi
 	printf "\n"
-	merge_file "$i" < /dev/tty > /dev/tty
+	merge_file "$i" <&3
 	last_status=$?
 	if test $last_status -ne 0; then
 	    rollup_status=1