| commit | 31f3482eeb9cd4c0d66431c4c30a0ac76907791b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:13 +0000 (4 17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 May 2010 00:50:13 +0000 (4 17:50 -0700) | ||
| tree | c04b74b6cb67a3d2b8a02f1629eefc4d4abbc6ca | treesnapshot (tar.gz zip) |
| parent | 1b0567f82e9d3d2ccd3c415411e8ebc15de5ba17 | commitdiff |
| parent | 0c3ef984fa2d4a42be787e168cfb189d15b00919 | commitdiff |
Merge branch 'bg/apply-blank-trailing-context' into next
* bg/apply-blank-trailing-context:
apply: Allow blank *trailing* context lines to match beyond EOF
* bg/apply-blank-trailing-context:
apply: Allow blank *trailing* context lines to match beyond EOF
| builtin/apply.c | diff1 | diff2 | blobhistory |
| t/t4124-apply-ws-rule.sh | diff1 | diff2 | blobhistory |