From: Heiko Voigt <hvoigt@hvoigt.net>
Date: Tue, 6 Jul 2010 19:34:31 +0000 (+0200)
Subject: add missing && to submodule-merge testcase
X-Git-Tag: v1.7.2-rc2~4^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=420432d4342e214c15f063a630a883072d4e5779;p=git.git

add missing && to submodule-merge testcase

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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 &&