![[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) |
* rs/diff-cleanup-records-fix:
diff: resurrect XDF_NEED_MINIMAL with --minimal
Revert removal of multi-match discard heuristic in 27af01
diff: resurrect XDF_NEED_MINIMAL with --minimal
Revert removal of multi-match discard heuristic in 27af01
| 1 | 2 | |||
|---|---|---|---|---|
| diff.c | patch | | diff1 | | diff2 | | blob | history |
| xdiff/xprepare.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc diff.c
Simple merge
diff --cc xdiff/xprepare.c
Simple merge