Junio C Hamano 713b85c758 Merge branch 'rs/diff-cleanup-records-fix' into maint ... * rs/diff-cleanup-records-fix: diff: resurrect XDF_NEED_MINIMAL with --minimal Revert removal of multi-match discard heuristic in 27af01		2011-10-21 10:49:25 -07:00
..
xdiff.h
xdiffi.c
xdiffi.h
xemit.c
xemit.h
xhistogram.c
xinclude.h
xmacros.h
xmerge.c
xpatience.c
xprepare.c	Merge branch 'rs/diff-cleanup-records-fix' into maint	2011-10-21 10:49:25 -07:00
xprepare.h
xtypes.h
xutils.c
xutils.h