6cf91492d9
If a patch modifies the last line of a file that previously had no terminating '\n', it looks like -old text \ No newline at end of file +new text Hence, a '\' line does not signal the end of the hunk. This modifies 'git apply --recount' to take this into account. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
---|---|---|
.. | ||
t-apply-1.expect | ||
t-apply-1.patch | ||
t-apply-2.expect | ||
t-apply-2.patch | ||
t-apply-3.expect | ||
t-apply-3.patch | ||
t-apply-4.expect | ||
t-apply-4.patch | ||
t-apply-5.expect | ||
t-apply-5.patch | ||
t-apply-6.expect | ||
t-apply-6.patch | ||
t-apply-7.expect | ||
t-apply-7.patch | ||
t-apply-8.expect | ||
t-apply-8.patch | ||
t-apply-9.expect | ||
t-apply-9.patch |