Merge branch 'maint'

* maint:
  t7406-submodule-update: add missing &&
This commit is contained in:
Junio C Hamano 2013-09-17 11:37:13 -07:00
commit 5e3a3a1527

View File

@ -58,7 +58,7 @@ test_expect_success 'setup a submodule tree' '
git submodule add ../merging merging && git submodule add ../merging merging &&
test_tick && test_tick &&
git commit -m "rebasing" git commit -m "rebasing"
) ) &&
(cd super && (cd super &&
git submodule add ../none none && git submodule add ../none none &&
test_tick && test_tick &&