X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6023-merge-file.sh;h=432f086c063198e82ad8a2f7c8dd175a8685fdf5;hb=139088b78b2b501d77a48d1d00b3b53ca16821e0;hp=d9f343942c7eb9d1e80e98db2252cb29135544fa;hpb=267684f0b7428583ba88c4acc0e9ef322a36b3ff;p=git.git

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index d9f343942..432f086c0 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
 '