From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Mar 2010 18:29:35 +0000 (-0700)
Subject: Merge branch 'bg/apply-fix-blank-at-eof'
X-Git-Tag: v1.7.1-rc0~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31fbae0f813b47801ee79a464a8257346a5f8f2c;p=git.git

Merge branch 'bg/apply-fix-blank-at-eof'

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

31fbae0f813b47801ee79a464a8257346a5f8f2c