index 14da2e365437598fbf7284d3d7098b5595856b23..0d5b42a25bbe79d3fb7b09ce4bf5107ee55928e5 100755 (executable)
'
# 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 &&