Merge branch 'dp/read-not-mmap-small-loose-object' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:26:17 +0000 (22:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:26:17 +0000 (22:26 -0800)
* dp/read-not-mmap-small-loose-object:
  hash-object: don't use mmap() for small files

1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge