Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:36 +0000 (11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:36 +0000 (11:06 +0900)
"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

1  2 
apply.c

diff --cc apply.c
Simple merge