From: Junio C Hamano 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.lorimer.id.au/gitweb.git/diff_plain/f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f?ds=inline;hp=--cc Merge branch 'jc/maint-mergetool-read-fix' * jc/maint-mergetool-read-fix: mergetool: check return value from read --- f50d0a7f4040f8a53360d9f6aa8a91bbab2fe39f