Johannes Schindelin 4fb08d2538 apply --allow-overlap: fix a corner case ...

Yes, yes, this is supposed to be only a band-aid option for `git add -p`
not Doing The Right Thing. But as long as we carry the `--allow-overlap`
option, we might just as well get it right.

This fixes the case where one hunk inserts a line before the first one,
and a hunk whose context overlaps with the first one's appends a line at
the end.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

2019-06-03 22:59:21 +02:00

131 KiB

Raw Blame History

View Raw