Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'
commitd78a122e9cb33df8e625fcf15cb075cc6d61b984
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:36 +0000 (27 11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:36 +0000 (27 11:06 +0900)
treea98238497bb2fed0f557736147d44099a41126cf
parentc2ed68342b8247d99fa1204872984ce9817fbaae
parent4855de123391daab82407b44de03ba5647e97694
Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'

"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
apply.c