From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Dec 2017 17:09:03 +0000 (-0800)
Subject: Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint
X-Git-Tag: v2.16.0-rc0~67^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43240cb7316a7ea653ada00adfddd5ea80f90cf3;p=thirdparty%2Fgit.git

Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint

"git apply --inaccurate-eof" when used with "--ignore-space-change"
triggered an internal sanity check, which has been fixed.

* rs/apply-inaccurate-eof-with-incomplete-line:
  apply: update line lengths for --inaccurate-eof
---

43240cb7316a7ea653ada00adfddd5ea80f90cf3