summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorVitaliy Ivanov <vitalivanov@gmail.com>2011-07-19 17:21:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-07-19 19:04:47 (GMT)
commitb5967f820c9774285ec4380e77d5356c3cd6eb99 (patch)
tree59ee1f942e0e75c994075593387009616d8c03a4 /t/t6023-merge-file.sh
parentd28790dc31ca1bcdca7254a6b9381b6c84e91271 (diff)
downloadgit-b5967f820c9774285ec4380e77d5356c3cd6eb99.zip
git-b5967f820c9774285ec4380e77d5356c3cd6eb99.tar.gz
git-b5967f820c9774285ec4380e77d5356c3cd6eb99.tar.bz2
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-xt/t6023-merge-file.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index d9f3439..432f086 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
'