Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bc/use-more-hardlinks-in-install'
[gitweb.git]
/
t
/
t7405-submodule-merge.sh
diff --git
a/t/t7405-submodule-merge.sh
b/t/t7405-submodule-merge.sh
index 9a21f783d3a5fedaa56df26919ab8e0456872e90..4a7b8933f4bf1036ba1e044d6e2dc54d72084039 100755
(executable)
--- a/
t/t7405-submodule-merge.sh
+++ b/
t/t7405-submodule-merge.sh
@@
-45,7
+45,7
@@
test_expect_success setup '
git commit -m sub-b) &&
git add sub &&
test_tick &&
- git commit -m b
+ git commit -m b
&&
git checkout -b c a &&
git merge -s ours b &&