diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 16:38:36 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 16:38:36 +0400 |
commit | e1ba0f6340c1d72677c7792a0a82ecf05363026e (patch) | |
tree | f298b749b5dbdc6e1e3d639da3950c3287f2a81a /combine-diff.c | |
parent | 70649945c215b1674611a40eda1d0058118a6d1a (diff) | |
parent | 0c3ef984fa2d4a42be787e168cfb189d15b00919 (diff) |
Merge branch 'bg/apply-blank-trailing-context' into maint
* bg/apply-blank-trailing-context:
apply: Allow blank *trailing* context lines to match beyond EOF
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions