X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6021-merge-criss-cross.sh;h=0ab14a6e81302db6a1239d68270ab909cb2fd216;hb=71b0251cdd2cc35a983e21d4e71285db56d2a519;hp=262381379f247a74f1656cfdd7f9b0c6d386d372;hpb=207a1f3ce9894ad6fab59077b9cec1adc70ed6c5;p=git.git diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index 262381379..0ab14a6e8 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -4,18 +4,12 @@ # # See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a -# nice decription of what this is about. +# nice description of what this is about. test_description='Test criss-cross merge' . ./test-lib.sh -if test "$no_python"; then - echo "Skipping: no python => no recursive merge" - test_done - exit 0 -fi - test_expect_success 'prepare repository' \ 'echo "1 2 @@ -26,7 +20,7 @@ test_expect_success 'prepare repository' \ 7 8 9" > file && -git add file && +git add file && git commit -m "Initial commit" file && git branch A && git branch B &&