Michael Haggerty cb0eded863 xdl_change_compact(): only use heuristic if group can't be matched ... If the changed group of lines can be matched to a group in the other file, then that positioning should take precedence over the compaction heuristic. The old code tried the heuristic unconditionally, which cost redundant effort and also was broken if the matching code had already shifted the group higher than the blank line. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2016-08-23 13:51:47 -07:00
..
xdiff.h	Merge branch 'jk/diff-compact-heuristic'	2016-05-06 14:45:46 -07:00
xdiffi.c	xdl_change_compact(): only use heuristic if group can't be matched	2016-08-23 13:51:47 -07:00
xdiffi.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xemit.c	xdiff: fix merging of appended hunk with -W	2016-06-09 15:27:26 -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	xdiff: cast arguments for ctype functions to unsigned char	2010-10-06 10:46:45 -07:00
xmerge.c	Merge branch 'ps/plug-xdl-merge-leak'	2016-02-26 13:37:22 -08:00
xpatience.c	xdiff: PATIENCE/HISTOGRAM are not independent option bits	2012-02-19 15:36:55 -08:00
xprepare.c	xdiff/xprepare: fix a memory leak	2016-03-04 15:51:08 -08:00
xprepare.h
xtypes.h
xutils.c	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00
xutils.h	diff: add --ignore-blank-lines option	2013-06-19 15:17:45 -07:00