git-commit-vandalism/xdiff
Junio C Hamano 86c340e082 Merge branch 'jc/diff-algo-cleanup'
Resurrects the preparatory clean-up patches from another topic that was
discarded, as this would give a saner foundation to build on diff.algo
configuration option series.

* jc/diff-algo-cleanup:
  xdiff: PATIENCE/HISTOGRAM are not independent option bits
  xdiff: remove XDL_PATCH_* macros
2012-04-15 22:51:15 -07:00
..
xdiff.h xdiff: PATIENCE/HISTOGRAM are not independent option bits 2012-02-19 15:36:55 -08:00
xdiffi.c xdiff: PATIENCE/HISTOGRAM are not independent option bits 2012-02-19 15:36:55 -08:00
xdiffi.h teach --histogram to diff 2011-07-12 09:29:20 -07:00
xemit.c Merge branch 'rs/diff-postimage-in-context' 2012-01-29 13:18:55 -08:00
xemit.h
xhistogram.c xdiff: PATIENCE/HISTOGRAM are not independent option bits 2012-02-19 15:36:55 -08:00
xinclude.h
xmacros.h
xmerge.c
xpatience.c xdiff: PATIENCE/HISTOGRAM are not independent option bits 2012-02-19 15:36:55 -08:00
xprepare.c xdiff: PATIENCE/HISTOGRAM are not independent option bits 2012-02-19 15:36:55 -08:00
xprepare.h
xtypes.h
xutils.c xdiff: do away with xdl_mmfile_next() 2011-08-03 10:15:16 -07:00
xutils.h xdiff/xprepare: use a smaller sample size for histogram diff 2011-07-12 09:30:00 -07:00