From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Aug 2011 00:36:06 +0000 (-0700)
Subject: Merge branch 'rc/histogram-diff'
X-Git-Tag: v1.7.7-rc0~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ca01600306863ecfa8bbef769b8e1386cb149785;p=git.git

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()
---

ca01600306863ecfa8bbef769b8e1386cb149785