Merge branch 'bg/apply-blank-trailing-context' into maint
commite1ba0f6340c1d72677c7792a0a82ecf05363026e
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:38:36 +0000 (21 05:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:38:36 +0000 (21 05:38 -0700)
treef298b749b5dbdc6e1e3d639da3950c3287f2a81a
parent70649945c215b1674611a40eda1d0058118a6d1a
parent0c3ef984fa2d4a42be787e168cfb189d15b00919
Merge branch 'bg/apply-blank-trailing-context' into maint

* bg/apply-blank-trailing-context:
  apply: Allow blank *trailing* context lines to match beyond EOF
builtin/apply.c