Code

Merge branch 'cb/maint-mergetool-no-tty'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:44 +0000 (09:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:43:44 +0000 (09:43 -0700)
commit1998f4c0966871d49ebf7f720dc58eb9f80771e9
tree50418170d8834e6e9f3479bc01517c234317050f
parent9502751181df4a1347b3bd0fe2f0f0cde9cfaa91
parentaf3147147f39274bd0d47faca196f84c4e9ec68d
Merge branch 'cb/maint-mergetool-no-tty'

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

Conflicts:
git-mergetool.sh
git-mergetool.sh