Code

Merge branch 'rc/histogram-diff'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2011 00:36:06 +0000 (17:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2011 00:36:06 +0000 (17:36 -0700)
commitca01600306863ecfa8bbef769b8e1386cb149785
tree30507da396d4a19240aed15c47a2f4356dd3987d
parent2f5cb6aa1e2eb7b12df85d5ddc4d8bc79be47b3d
parent6486a84cb8e69ddf03b2139db3d968400e05f5b3
Merge branch 'rc/histogram-diff'

* 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()
Makefile
diff.c