summaryrefslogtreecommitdiff
path: root/t/t6027-merge-binary.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6027-merge-binary.sh')
-rwxr-xr-xt/t6027-merge-binary.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6027-merge-binary.sh b/t/t6027-merge-binary.sh
index b519626ca0..07735410b9 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 &&