Merge branch 'cb/maint-mergetool-no-tty'
* cb/maint-mergetool-no-tty: mergetool: Remove explicit references to /dev/tty Conflicts: git-mergetool.sh
Junio C Hamano committed
Sep 3, 2010 at 09:43 UTC
1998f4c0966871d49ebf7f720dc58eb9f80771e9
No changes.