Andrew's git / gitweb.git / diff
?
Merge branch 'jc/maint-mergetool-read-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:42:38 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:42:38 +0000 (14:42 -0700)
* jc/maint-mergetool-read-fix:
mergetool: check return value from read

Trivial merge