From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Oct 2011 02:03:22 +0000 (-0700)
Subject: Merge branch 'rs/diff-cleanup-records-fix'
X-Git-Tag: v1.7.8-rc0~79
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7a63a920fd9842f0ccb7a88c8df7652d905fc1ec;p=git-core%2Fgit.git

Merge branch 'rs/diff-cleanup-records-fix'

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

7a63a920fd9842f0ccb7a88c8df7652d905fc1ec