Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t/t2021-checkout-last: "checkout -" should work after a rebase finishes
[gitweb.git]
/
t
/
t6027-merge-binary.sh
diff --git
a/t/t6027-merge-binary.sh
b/t/t6027-merge-binary.sh
index b519626ca09255a433b0d1cb32780a6feafa09f6..07735410b9536ba7639134c7ca0cda4f486f8291 100755
(executable)
--- 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"/test
4012
.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 &&