X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6023-merge-file.sh;h=42620e0732bfdcb0370ca9317670e9ac1e11c735;hb=92bb978541af02ac624d1b9aeec296691cc15734;hp=f674c48cab3e80d63b5a5831c667b8e08b542905;hpb=1f8dc671557a7330eaee9c0296bfad669d26a1b8;p=git.git

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index f674c48ca..42620e073 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -136,7 +136,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 ../test4012.png new1.txt 2> merge.err &&
+		orig.txt "$TEST_DIRECTORY"/test4012.png new1.txt 2> merge.err &&
 	grep "Cannot merge binary files" merge.err
 '