Am 6/8/2010 13:34, schrieb Johannes Sixt: > +test_expect_failure 'merge-recursive simple w/submodule result' ' > + > + git ls-files -s >actual && > + ( > + echo "100644 $o5 0 a" > + echo "100644 $o0 0 c" > + echo "100644 $c1 0 d" Make this line echo "160000 $c1 0 d" Sorry! > + ) >expected && > + test_cmp expected actual -- Hannes -- 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