Merge branch 'bg/apply-fix-blank-at-eof' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:23:50 +0000 (16:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Mar 2010 23:23:50 +0000 (16:23 -0700)
* bg/apply-fix-blank-at-eof:
t3417: Add test cases for "rebase --whitespace=fix"
t4124: Add additional tests of --whitespace=fix
apply: Allow blank context lines to match beyond EOF
apply: Remove the quick rejection test
apply: Don't unnecessarily update line lengths in the preimage

Trivial merge