Merge branch 'jk/maint-apply-no-binary' into maint
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)
* jk/maint-apply-no-binary:
  apply: don't segfault on binary files with missing data


Trivial merge