Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'dm/add-i-edit-abort'
[gitweb.git]
/
t
/
t6027-merge-binary.sh
diff --git
a/t/t6027-merge-binary.sh
b/t/t6027-merge-binary.sh
index 92ca1f0f8ccabe6f01159ea3e4a73683387ec4a3..b519626ca09255a433b0d1cb32780a6feafa09f6 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
..
/test4012.png >m &&
+ cat
"$TEST_DIRECTORY"
/test4012.png >m &&
git add m &&
git ls-files -s | sed -e "s/ 0 / 1 /" >E1 &&
test_tick &&