Alex Riesen schrieb: > +test_expect_success 'merge removes empty directories' ' > + > + git reset --hard master && > + git checkout -b rm && > + git rm d/e && > + git commit -mremoved-d/e && > + git checkout master && > + git merge -s recursive rm && > + test_must_fail test -d d FWIW, 'test_must_fail' is intended for git commands only. Here, ! test -d d would be just fine. > +' > + > test_done -- 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
