Merge branch 'jk/maint-apply-no-binary' into maint
commit9bdef78fb05ce2ca7788518e17ae20488b153335
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:47:04 +0000 (24 12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:47:04 +0000 (24 12:47 -0800)
tree7ad1aaab6e9e0adcf9e627f9e5d0357d86bac838
parentd2a99221a768e2a231338fbe17d92ffa7e0458af
parent24305cd7009d682ba4115103c95844446a2bb305
Merge branch 'jk/maint-apply-no-binary' into maint

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