From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 17:49:25 +0000 (-0700)
Subject: Merge branch 'rs/diff-cleanup-records-fix' into maint
X-Git-Tag: v1.7.7.1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=713b85c758926876af93fcabf4aae83391778195;p=git.git

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

713b85c758926876af93fcabf4aae83391778195