Code

Merge branch 'jk/maint-apply-no-binary' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:05 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:05 +0000 (11:39 -0700)
commit8b7543a6a5ade6f906e8844d2f996c87a1f4015f
tree5a8f8df768246ed44351907221ee8c913dd0910e
parentbc8f2fb5be3421be168c765fac893bedc93d706e
parent24305cd7009d682ba4115103c95844446a2bb305
Merge branch 'jk/maint-apply-no-binary' into next

* jk/maint-apply-no-binary:
  apply: don't segfault on binary files with missing data