From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Oct 2008 00:58:25 +0000 (-0700)
Subject: Merge branch 'jk/diff-convfilter'
X-Git-Tag: v1.6.1-rc1~113
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f91bcfa9d8d1f443012e3e92092f464f3bb3557?hp=-c

Merge branch 'jk/diff-convfilter'

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

2f91bcfa9d8d1f443012e3e92092f464f3bb3557