Merge branch 'bg/apply-blank-trailing-context'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:37:41 +0000 (22:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:37:41 +0000 (22:37 -0700)
commitb7511571e3ecd6b81a47e42a52cf9b5160a3d6e9
tree56c67e4fdf0f4e30433939d3443543bc9c93851f
parentdaa81c4a4a48a76e542293c025972e6a870fec9b
parent0c3ef984fa2d4a42be787e168cfb189d15b00919
Merge branch 'bg/apply-blank-trailing-context'

* bg/apply-blank-trailing-context:
  apply: Allow blank *trailing* context lines to match beyond EOF
builtin/apply.c
t/t4124-apply-ws-rule.sh