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

xdl_merge(): move file1 and file2 labels to xmparam structure

2010-03-20 20:36:10 -07:00

xdiffi.c

refactor: use bitsizeof() instead of 8 * sizeof()

2009-07-22 21:57:41 -07:00

xdiffi.h

Implement the patience diff algorithm

2009-01-07 13:35:44 -08:00

xemit.c

diff: avoid repeated scanning while looking for funcname

2010-09-30 11:43:07 -07:00

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

Implement the patience diff algorithm

2009-01-07 13:35:44 -08:00

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

…