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	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xemit.c	xdiff: fix merging of hunks with -W context and -u context	2016-09-14 16:07:21 -07:00
xemit.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xhistogram.c	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
xinclude.h
xmacros.h
xmerge.c	Merge branch 'ps/plug-xdl-merge-leak'	2016-02-26 13:37:22 -08:00
xpatience.c	diff: fix a double off-by-one with --ignore-space-at-eol	2016-07-11 11:55:53 -07:00
xprepare.c	xdiff/xprepare: fix a memory leak	2016-03-04 15:51:08 -08:00
xprepare.h
xtypes.h
xutils.c	diff: fix a double off-by-one with --ignore-space-at-eol	2016-07-11 11:55:53 -07:00
xutils.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00