aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorHeiko Voigt <hvoigt@hvoigt.net>2010-07-06 21:34:31 +0200
committerJunio C Hamano <gitster@pobox.com>2010-07-06 21:28:55 -0700
commit420432d4342e214c15f063a630a883072d4e5779 (patch)
tree0f656eec1ac51918387de97e3e7c21d57f6820c6 /t
parentd66ee046fc8597af62daeb890b15d5799c786b0d (diff)
downloadgit-420432d4342e214c15f063a630a883072d4e5779.tar.gz
git-420432d4342e214c15f063a630a883072d4e5779.tar.xz
add missing && to submodule-merge testcase
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7405-submodule-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 9a21f783d..4a7b8933f 100755
--- 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 &&