diff options
author | René Scharfe <l.s.r@web.de> | 2016-09-14 19:05:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-15 02:07:21 +0300 |
commit | 45d2f75f913c0545be473db1dc2595a1600413f5 (patch) | |
tree | 7e8fdfcb8af1d601222425123753df23686c91ff /unix-socket.h | |
parent | 0202c411edc25940cc381bf317badcdf67670be4 (diff) |
xdiff: fix merging of hunks with -W context and -u context
If the function context for a hunk (with -W) reaches the beginning of
the next hunk then we need to merge these two -- otherwise we'd show
some lines twice, which looks strange and even confuses git apply. We
already do this checking and merging in xdl_emit_diff(), but forget to
consider regular context (with -u or -U).
Fix that by merging hunks already if function context of the first one
touches or overlaps regular context of the second one.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unix-socket.h')
0 files changed, 0 insertions, 0 deletions