From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Sun, 25 Sep 2011 13:39:08 +0000 (+0800)
Subject: Revert removal of multi-match discard heuristic in 27af01
X-Git-Tag: v1.7.7.1~6^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c5aa90682f82fe0dabdc0280be93568d52efddfc?hp=c5aa90682f82fe0dabdc0280be93568d52efddfc

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>
---