![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Mar 2010 23:23:50 +0000 (16:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Mar 2010 23:23:50 +0000 (16:23 -0700) | ||
| commit | 7b676b1bb53c936770a07354ec6c6550fb31b421 | |
| tree | ee46af290fec7e3bdf30b5759a887928c9a15147 | tree | snapshot |
| parent | 846b8f681a0a75cec2b930007c84e98346940459 | commit | diff |
| parent | 59f5ced65b46370a121916593cce7fcd210a15df | commit | diff |
Merge branch 'bg/apply-fix-blank-at-eof' into maint
* 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
* 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