Merge branch 'rc/histogram-diff' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2011 20:08:39 +0000 (13:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2011 20:08:39 +0000 (13:08 -0700)
commit684dfd15992eb578c54b3dcc429aa89158e0ac6a
tree30221c793cbbefe19d1a29e7d1cbf47542e0d2b9
parent3f24b643afbca5e423eb4027bb485ada3bcf2cc3
parent6486a84cb8e69ddf03b2139db3d968400e05f5b3
Merge branch 'rc/histogram-diff' into next

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