![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700) | ||
| commit | 7a63a920fd9842f0ccb7a88c8df7652d905fc1ec | |
| tree | 9939c7ff07902ea3e3446d1f1388d32ec99e1721 | tree | snapshot |
| parent | 0941d6054524bc91f45bf3cbb1c641712b0e0e6d | commit | diff |
| parent | 81b568c839376a10cd5fe29db0b8a72f537fa36a | commit | diff |
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
* 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 | | blob | history |
| xdiff/xprepare.c | diff1 | | diff2 | | blob | history |