git/xdiff at 45d2f75f913c0545be473db1dc2595a1600413f5 - git

mirror of https://github.com/git/git.git synced 2025-04-12 16:23:03 +00:00

History

René Scharfe 45d2f75f91 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>

2016-09-14 16:07:21 -07:00

xdiff.h

Merge branch 'jk/diff-compact-heuristic'

2016-05-06 14:45:46 -07:00

xdiffi.c

xdiff: implement empty line chunk heuristic

2016-04-19 10:53:34 -07:00

xdiffi.h

…

xemit.c

xdiff: fix merging of hunks with -W context and -u context

2016-09-14 16:07:21 -07:00