Skip to content

Commit

Permalink
fixup??? tests: move test PNGs into t/lib-diff/
Browse files Browse the repository at this point in the history
This is required by `bc/merge-file-object-input`.

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
dscho authored and Git for Windows Build Agent committed Nov 6, 2023
1 parent 39bf003 commit 22439da
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t6403-merge-file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 22439da

Please sign in to comment.