@@ -232,11 +232,11 @@ test_expect_success 'apply with --3way --cached and conflicts' '
232
232
233
233
test_expect_success ' apply binary file patch' '
234
234
git reset --hard main &&
235
- cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
235
+ cp "$TEST_DIRECTORY/lib-diff/ test-binary-1.png" bin.png &&
236
236
git add bin.png &&
237
237
git commit -m "add binary file" &&
238
238
239
- cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
239
+ cp "$TEST_DIRECTORY/lib-diff/ test-binary-2.png" bin.png &&
240
240
241
241
git diff --binary >bin.diff &&
242
242
git reset --hard &&
@@ -247,11 +247,11 @@ test_expect_success 'apply binary file patch' '
247
247
248
248
test_expect_success ' apply binary file patch with 3way' '
249
249
git reset --hard main &&
250
- cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
250
+ cp "$TEST_DIRECTORY/lib-diff/ test-binary-1.png" bin.png &&
251
251
git add bin.png &&
252
252
git commit -m "add binary file" &&
253
253
254
- cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
254
+ cp "$TEST_DIRECTORY/lib-diff/ test-binary-2.png" bin.png &&
255
255
256
256
git diff --binary >bin.diff &&
257
257
git reset --hard &&
@@ -262,11 +262,11 @@ test_expect_success 'apply binary file patch with 3way' '
262
262
263
263
test_expect_success ' apply full-index patch with 3way' '
264
264
git reset --hard main &&
265
- cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
265
+ cp "$TEST_DIRECTORY/lib-diff/ test-binary-1.png" bin.png &&
266
266
git add bin.png &&
267
267
git commit -m "add binary file" &&
268
268
269
- cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
269
+ cp "$TEST_DIRECTORY/lib-diff/ test-binary-2.png" bin.png &&
270
270
271
271
git diff --full-index >bin.diff &&
272
272
git reset --hard &&
0 commit comments