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

Junio C Hamano committed Oct 21, 2011 at 10:49 UTC 713b85c758926876af93fcabf4aae83391778195

No changes.