Merge branch 'maint'

* maint: git-mergetool: check return value from read

Junio C Hamano committed Sep 19, 2011 at 20:46 UTC 5ec8217eb6c89974fda94808a310aa651577b25d

No changes.