X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6027-merge-binary.sh;h=b519626ca09255a433b0d1cb32780a6feafa09f6;hb=58245a5e40e1f95976a4f0fd53c2e8d3a1c3c763;hp=92ca1f0f8ccabe6f01159ea3e4a73683387ec4a3;hpb=a473445ac256f4a6ca5c66f83f33b85eec0e0c48;p=git.git diff --git a/t/t6027-merge-binary.sh b/t/t6027-merge-binary.sh index 92ca1f0f8..b519626ca 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 ../test4012.png >m && + cat "$TEST_DIRECTORY"/test4012.png >m && git add m && git ls-files -s | sed -e "s/ 0 / 1 /" >E1 && test_tick &&