Merge branch 'mm/empty-loose-error-message' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 22:00:25 +0000 (14:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 22:00:25 +0000 (14:00 -0800)
* mm/empty-loose-error-message:
  fsck: give accurate error message on empty loose object files

1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge