Junio C Hamano <gitster@xxxxxxxxx> writes: > Heiko Voigt <hvoigt@xxxxxxxxxx> writes: > >> diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh >> index 8f6f2d6..603fb72 100755 >> --- a/t/t7405-submodule-merge.sh >> +++ b/t/t7405-submodule-merge.sh >> @@ -269,7 +269,7 @@ test_expect_success 'setup for recursive merge with submodule' ' >> ' >> >> # merge should leave submodule unmerged in index >> -test_expect_failure 'recursive merge with submodule' ' >> +test_expect_success 'recursive merge with submodule' ' >> (cd merge-recursive && >> test_must_fail git merge top-bc && >> echo "160000 $(git rev-parse top-cb:sub) 2 sub" > expect2 && > > What is this patch based on? Ah, nevermind. I figured it out. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html