![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Oct 2008 00:58:25 +0000 (17:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Oct 2008 00:58:25 +0000 (17:58 -0700) | ||
| commit | 2f91bcfa9d8d1f443012e3e92092f464f3bb3557 | |
| tree | 1813dc04efc420f0ece0b29481628d22831dd258 | tree | snapshot |
| parent | ca6c06b2efe2f55c498670efcb419bce35678e03 | commit | diff |
| parent | 9cb92c390cefd3bf3f71bbda12eb04893c861361 | commit | diff |
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
* 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