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)
* maint:
  count-delta: match get_delta_hdr_size() changes.
  check patch_delta bounds more carefully

1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge