Merge branch 'rs/diff-cleanup-records-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)
commit713b85c758926876af93fcabf4aae83391778195
treebab82ae02e533f5d6abc201a447d8a5908c3e851
parent689b047072030db30d101d43dbef6afd3b703c09
parent81b568c839376a10cd5fe29db0b8a72f537fa36a
Merge branch 'rs/diff-cleanup-records-fix' into maint

* rs/diff-cleanup-records-fix:
  diff: resurrect XDF_NEED_MINIMAL with --minimal
  Revert removal of multi-match discard heuristic in 27af01
diff.c
xdiff/xprepare.c