diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:25 -0700 |
| commit | 2f91bcfa9d8d1f443012e3e92092f464f3bb3557 (patch) | |
| tree | 1813dc04efc420f0ece0b29481628d22831dd258 /t | |
| parent | ca6c06b2efe2f55c498670efcb419bce35678e03 (diff) | |
| parent | 9cb92c390cefd3bf3f71bbda12eb04893c861361 (diff) | |
| download | git-2f91bcfa9d8d1f443012e3e92092f464f3bb3557.tar.gz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4012-diff-binary.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 421f4bba3f..3cf5b5c4ea 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -25,11 +25,11 @@ cat > expected <<\EOF EOF test_expect_success 'diff without --binary' \ 'git diff | git apply --stat --summary >current && - cmp current expected' + test_cmp expected current' test_expect_success 'diff with --binary' \ 'git diff --binary | git apply --stat --summary >current && - cmp current expected' + test_cmp expected current' # apply needs to be able to skip the binary material correctly # in order to report the line number of a corrupt patch. |