From: Heiko Voigt Date: Wed, 07 Jul 2010 13:39:10 GMT Subject: [PATCH v3 1/4] add missing && to submodule-merge testcase Message-ID: <5eacc71cb957723a780d20567cb66a8b83384253.1278508352.git.hvoigt@hvoigt.net> In-Reply-To: Signed-off-by: Heiko Voigt --- t/t7405-submodule-merge.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 9a21f78..4a7b893 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 && -- 1.7.2.rc1.13.g513fa.dirty