Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mm/remote-mediawiki-build'
[gitweb.git]
/
t
/
t6029-merge-subtree.sh
diff --git
a/t/t6029-merge-subtree.sh
b/t/t6029-merge-subtree.sh
index 3900d9f61f84a9eab907e87fca7bb9429ea36f04..73fc240e8548911c65c4dffc4da0c6ff8ab4f27b 100755
(executable)
--- a/
t/t6029-merge-subtree.sh
+++ b/
t/t6029-merge-subtree.sh
@@
-6,7
+6,7
@@
test_description='subtree merge strategy'
test_expect_success setup '
- s="1 2 3 4 5 6 7 8"
+ s="1 2 3 4 5 6 7 8"
&&
for i in $s; do echo $i; done >hello &&
git add hello &&
git commit -m initial &&