From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Jul 2011 21:42:38 +0000 (-0700)
Subject: Merge branch 'jc/maint-mergetool-read-fix'
X-Git-Tag: v1.7.7-rc0~80
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f;p=git.git

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

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

f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f