Code

Merge branch 'rs/diff-cleanup-records-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700)
commit7a63a920fd9842f0ccb7a88c8df7652d905fc1ec
tree9939c7ff07902ea3e3446d1f1388d32ec99e1721
parent0941d6054524bc91f45bf3cbb1c641712b0e0e6d
parent81b568c839376a10cd5fe29db0b8a72f537fa36a
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
diff.c
xdiff/xprepare.c