diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-27 14:29:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-27 14:29:55 -0700 |
| commit | 36889a5078767be8cc0189c10d235dda327c6a30 (patch) | |
| tree | 84275b41ab53dd6b81bbf2cab25f70d221989be1 /t/t6021-merge-criss-cross.sh | |
| parent | 019298015bb7c826b72f2573047b7221b0921fd3 (diff) | |
| download | git-36889a5078767be8cc0189c10d235dda327c6a30.tar.gz | |
tests: merge-recursive is usable without Python
Many tests still protected themselves with $no_python; there is no need
to do so anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
| -rwxr-xr-x | t/t6021-merge-criss-cross.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh index 8f7366da8d..499cafb882 100755 --- a/t/t6021-merge-criss-cross.sh +++ b/t/t6021-merge-criss-cross.sh @@ -10,12 +10,6 @@ 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 |