| commit | 91f035fe991d4138e1914fa75dc45d745cc00825 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:42:02 +0000 (6 15:42 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Oct 2011 22:42:02 +0000 (6 15:42 -0700) | ||
| tree | d9c72f4ccda59a295b9a451eb2a89abbf47a16f5 | treesnapshot (tar.gz zip) |
| parent | b8c26d25490f00d4ad7d1408818c5d425c9a78d9 | commitdiff |
| parent | 81b568c839376a10cd5fe29db0b8a72f537fa36a | commitdiff |
Merge branch 'rs/diff-cleanup-records-fix' into next
* rs/diff-cleanup-records-fix:
diff: resurrect XDF_NEED_MINIMAL with --minimal
Revert removal of multi-match discard heuristic in 27af01
* rs/diff-cleanup-records-fix:
diff: resurrect XDF_NEED_MINIMAL with --minimal
Revert removal of multi-match discard heuristic in 27af01
| diff.c | diff1 | diff2 | blobhistory |
| xdiff/xprepare.c | diff1 | diff2 | blobhistory |