Merge branch 'rc/histogram-diff'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Sep 2011 18:42:58 +0000 (11:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Sep 2011 18:42:58 +0000 (11:42 -0700)
* rc/histogram-diff:
  xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()

1  2 
xdiff/xprepare.c

Simple merge