Merge branch 'jc/maint-mergetool-read-fix'

* jc/maint-mergetool-read-fix: mergetool: check return value from read

Junio C Hamano committed Jul 22, 2011 at 14:42 UTC f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f

No changes.