提交 420432d4 编写于 作者: H Heiko Voigt 提交者: Junio C Hamano

add missing && to submodule-merge testcase

Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 d66ee046
......@@ -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 &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册