From 420432d4342e214c15f063a630a883072d4e5779 Mon Sep 17 00:00:00 2001 From: Heiko Voigt Date: Tue, 6 Jul 2010 21:34:31 +0200 Subject: [PATCH] add missing && to submodule-merge testcase Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano --- t/t7405-submodule-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 9a21f783d3..4a7b8933f4 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 && -- 2.11.4.GIT