X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6027-merge-binary.sh;h=07735410b9536ba7639134c7ca0cda4f486f8291;hb=b81b758d5001c4ebab1a5b8202bb1b0f4cdf3391;hp=b519626ca09255a433b0d1cb32780a6feafa09f6;hpb=12644fa99fd16c33379c885670be0963cec07fc1;p=git.git diff --git a/t/t6027-merge-binary.sh b/t/t6027-merge-binary.sh index b519626ca..07735410b 100755 --- a/t/t6027-merge-binary.sh +++ b/t/t6027-merge-binary.sh @@ -6,7 +6,7 @@ test_description='ask merge-recursive to merge binary files' test_expect_success setup ' - cat "$TEST_DIRECTORY"/test4012.png >m && + cat "$TEST_DIRECTORY"/test-binary-1.png >m && git add m && git ls-files -s | sed -e "s/ 0 / 1 /" >E1 && test_tick &&