@matheusbsbs / matheus-bagliano / commits / 420432d434
Fork 0

add missing && to submodule-merge testcase

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

Heiko Voigt committed Jul 6, 2010 at 21:34 UTC 420432d4342e214c15f063a630a883072d4e5779
1 file changed +1 -1
t/t7405-submodule-merge.sh
+1 -1
@@ -45,7 +45,7 @@ test_expect_success setup '
45 git commit -m sub-b) &&
46 git add sub &&
47 test_tick &&
48 - git commit -m b
48 + git commit -m b &&
49
50 git checkout -b c a &&
51 git merge -s ours b &&