From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Mar 2010 23:23:50 +0000 (-0700)
Subject: Merge branch 'bg/apply-fix-blank-at-eof' into maint
X-Git-Tag: v1.7.0.4~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7b676b1bb53c936770a07354ec6c6550fb31b421;p=git.git

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
---

7b676b1bb53c936770a07354ec6c6550fb31b421