From: Heiko Voigt 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: https://git.lorimer.id.au/gitweb.git/diff_plain/420432d4342e214c15f063a630a883072d4e5779 add missing && to submodule-merge testcase Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano --- 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 &&