Kong Lucien <Lucien.Kong@xxxxxxxxxxxxxxx> writes: > +test_expect_success 'status when conflicts unresolved' ' > + git init --shared --bare conflict_test.git && > + git clone conflict_test.git test1 && > + git clone conflict_test.git test2 && I already asked off-list, but why do you need 3 repositories here. Wouldn't it be simpler to have 2 branches and test conflicts with "git merge"? -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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