From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Sep 2010 16:43:44 +0000 (-0700)
Subject: Merge branch 'cb/maint-mergetool-no-tty'
X-Git-Tag: v1.7.3-rc0~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1998f4c0966871d49ebf7f720dc58eb9f80771e9;p=git.git

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

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

Conflicts:
	git-mergetool.sh
---

1998f4c0966871d49ebf7f720dc58eb9f80771e9
diff --cc git-mergetool.sh
index bd7ab02f1,e7fa67bd9..2f8dc441c
--- a/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
+ 
+     # Save original stdin
+     exec 3<&0
+ 
 -    echo Merging the files: "$files"
 -    git ls-files -u |
 -    sed -e 's/^[^	]*	//' |
 -    sort -u |
 +    printf "Merging:\n"
 +    printf "$files\n"
 +
 +    files_to_merge |
      while IFS= read i
      do
  	if test $last_status -ne 0; then