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

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

Conflicts:
	git-mergetool.sh

diff --cc git-mergetool.sh
index bd7ab02f1161d2d97ea57b2a2ceacc307f6a74e8,e7fa67bd9c227b703dd4852c18b064463c8c92d6..2f8dc441c6d575323f2fad920ecdb7b20e1445e6
--- 1/git-mergetool.sh
--- 2/git-mergetool.sh
+++ b/git-mergetool.sh
@@@ -289,10 -271,14 +289,14 @@@ if test $# -eq 0 ; the
        echo "No files need merging"
        exit 0
      fi
 -    echo Merging the files: "$files"
 -    git ls-files -u |
 -    sed -e 's/^[^     ]*      //' |
 -    sort -u |
+ 
+     # Save original stdin
+     exec 3<&0
+ 
 +    printf "Merging:\n"
 +    printf "$files\n"
 +
 +    files_to_merge |
      while IFS= read i
      do
        if test $last_status -ne 0; then