Merge branch 'cs/perl-config-path-send-email'

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index d9f343942c7eb9d1e80e98db2252cb29135544fa..432f086c063198e82ad8a2f7c8dd175a8685fdf5 100755 (executable)
--- 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
 '