Merge branch 'jk/diff-convfilter'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:58:25 +0000 (17:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:58:25 +0000 (17:58 -0700)
* jk/diff-convfilter:
  diff: add filter for converting binary to text
  diff: introduce diff.<driver>.binary
  diff: unify external diff and funcname parsing code
  t4012: use test_cmp instead of cmp


Trivial merge