Merge branch 'jm/maint-misc-fix' into maint

* jm/maint-misc-fix: read_gitfile_gently: use ssize_t to hold read result remove tests of always-false condition rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'

Junio C Hamano committed May 30, 2011 at 00:09 UTC 5b42477b59886a85d4b49a60313f9b9d4a0d576f

No changes.