From: Junio C Hamano Date: Mon, 21 Jun 2010 12:38:36 +0000 (-0700) Subject: Merge branch 'bg/apply-blank-trailing-context' into maint X-Git-Tag: v1.7.2-rc0~38^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1ba0f6340c1d72677c7792a0a82ecf05363026e;p=thirdparty%2Fgit.git Merge branch 'bg/apply-blank-trailing-context' into maint * bg/apply-blank-trailing-context: apply: Allow blank *trailing* context lines to match beyond EOF --- e1ba0f6340c1d72677c7792a0a82ecf05363026e