From: Junio C Hamano Date: Mon, 12 Sep 2011 04:53:39 +0000 (-0700) Subject: Merge branch 'jc/maint-mergetool-read-fix' into maint X-Git-Tag: v1.7.6.3~8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b3038a5adb00a42afed69da31b6a8d85d5e3fad1;p=git.git Merge branch 'jc/maint-mergetool-read-fix' into maint * jc/maint-mergetool-read-fix: mergetool: check return value from read --- b3038a5adb00a42afed69da31b6a8d85d5e3fad1