Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:51:55 +0000 (16:51 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 7 Apr 2006 23:51:55 +0000 (16:51 -0700)
commitce18135d862b5dbc731d203b27c279529e58b54b
treefdaa08600484cb4f2d803e010719cfa314b5f0e0
parent9760662f1a7a06516ca249a73e5c1a6fb6c0e26e
parent98cf8156078eb5256d77d01786863185a1728140
Merge branch 'maint'

* maint:
  count-delta: match get_delta_hdr_size() changes.
  check patch_delta bounds more carefully
sha1_file.c