René Scharfe c5aa90682f Revert removal of multi-match discard heuristic in 27af01 ... 27af01d (xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records(), 2011-08-17) was supposed to be a performance boost only. However, it unexpectedly changed the behaviour of diff. Revert a part of 27af01d that removes logic that mark lines as "multi-match" (ie. dis[i] == 2). This was preventing the multi-match discard heuristic (performed in xdl_cleanup_records() and xdl_clean_mmatch()) from executing. Reported-by: Alexander Pepper <pepper@inf.fu-berlin.de> Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2011-09-26 11:38:14 -07:00
..
xdiff.h	…
xdiffi.c	…
xdiffi.h	…
xemit.c	…
xemit.h	…
xinclude.h	…
xmacros.h	xdiff: cast arguments for ctype functions to unsigned char	2010-10-06 10:46:45 -07:00
xmerge.c	xdiff: cast arguments for ctype functions to unsigned char	2010-10-06 10:46:45 -07:00
xpatience.c	…
xprepare.c	Revert removal of multi-match discard heuristic in 27af01	2011-09-26 11:38:14 -07:00
xprepare.h	…
xtypes.h	…
xutils.c	xdiff: cast arguments for ctype functions to unsigned char	2010-10-06 10:46:45 -07:00
xutils.h	…