From 22439daf629ae2979fe56ff558719a549567780c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 2 Nov 2023 09:00:07 +0100 Subject: [PATCH] fixup??? tests: move test PNGs into t/lib-diff/ This is required by `bc/merge-file-object-input`. Signed-off-by: Johannes Schindelin --- t/t6403-merge-file.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6403-merge-file.sh b/t/t6403-merge-file.sh index ed155c21dda48b..afbaa470db1599 100755 --- a/t/t6403-merge-file.sh +++ b/t/t6403-merge-file.sh @@ -301,7 +301,7 @@ test_expect_success 'binary files cannot be merged' ' ' test_expect_success 'binary files cannot be merged with --object-id' ' - cp "$TEST_DIRECTORY"/test-binary-1.png . && + cp "$TEST_DIRECTORY"/lib-diff/test-binary-1.png . && git add orig.txt new1.txt test-binary-1.png && test_must_fail git merge-file --object-id \ :orig.txt :test-binary-1.png :new1.txt 2> merge.err &&