diff options
| author |  Vitaliy Ivanov <vitalivanov@gmail.com> | 2011-07-19 20:21:47 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-07-19 12:04:47 -0700 |
| commit | b5967f820c9774285ec4380e77d5356c3cd6eb99 (patch) | |
| tree | 59ee1f942e0e75c994075593387009616d8c03a4 /t/t6023-merge-file.sh | |
| parent | docs: document --textconv diff option (diff) | |
| download | tgif-b5967f820c9774285ec4380e77d5356c3cd6eb99.tar.xz | |
tests: cleanup binary test vector files
The test4012.png test vector file that was originally used for t4012 to
check operations on binary files was later reused in other tests, making
it no longer consistent to name it after a specific test. Rename it to more
generic "test-binary-1.png".
While at it, rename test9200b to "test-binary-2.png" (even though it is
only used by t9200).
Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
| -rwxr-xr-x | t/t6023-merge-file.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index d9f343942c..432f086c06 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -154,7 +154,7 @@ test_expect_success "expected conflict markers" "test_cmp expect out" test_expect_success 'binary files cannot be merged' ' test_must_fail git merge-file -p \ - orig.txt "$TEST_DIRECTORY"/test4012.png new1.txt 2> merge.err && + orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err && grep "Cannot merge binary files" merge.err ' |