mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
add missing && to submodule-merge testcase
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d66ee046fc
commit
420432d434
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue