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

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

Junio C Hamano committed Sep 11, 2011 at 21:53 UTC b3038a5adb00a42afed69da31b6a8d85d5e3fad1

No changes.