Junio C Hamano b14b969ab9 Merge branch 'rc/histogram-diff' into HEAD ...

* rc/histogram-diff:
  xdiff/xhistogram: drop need for additional variable
  xdiff/xhistogram: rely on xdl_trim_ends()
  xdiff/xhistogram: rework handling of recursed results
  xdiff: do away with xdl_mmfile_next()
  Make test number unique
  xdiff/xprepare: use a smaller sample size for histogram diff
  xdiff/xprepare: skip classification
  teach --histogram to diff
  t4033-diff-patience: factor out tests
  xdiff/xpatience: factor out fall-back-diff function
  xdiff/xprepare: refactor abort cleanups
  xdiff/xprepare: use memset()

Conflicts:
	xdiff/xprepare.c

2011-08-17 17:17:16 -07:00

..

xdiff.h

xdiff: do away with xdl_mmfile_next()

2011-08-03 10:15:16 -07:00

xdiffi.c

teach --histogram to diff

2011-07-12 09:29:20 -07:00

xdiffi.h

teach --histogram to diff

2011-07-12 09:29:20 -07:00

xemit.c

…

xemit.h

…

xhistogram.c

xdiff/xhistogram: drop need for additional variable

2011-08-08 13:00:17 -07:00

xinclude.h

…

xmacros.h

xdiff: cast arguments for ctype functions to unsigned char

2010-10-06 10:46:45 -07:00

xmerge.c

xdiff: cast arguments for ctype functions to unsigned char

2010-10-06 10:46:45 -07:00

xpatience.c

xdiff/xpatience: factor out fall-back-diff function

2011-07-07 09:41:24 -07:00

xprepare.c

Merge branch 'rc/histogram-diff' into HEAD

2011-08-17 17:17:16 -07: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