Merge branch 'cr/tag'

diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index b70e177ddd75ca19c3be2698cb1a998b1bf85759..0779aaa9aba16f0f8502505b4df5cc49cfe8af82 100755 (executable)
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -7,12 +7,6 @@ test_description='git rebase --merge test'
 
 . ./test-lib.sh
 
-if test "$no_python"; then
-       echo "Skipping: no python => no recursive merge"
-       test_done
-       exit 0
-fi
-
 T="A quick brown fox
 jumps over the lazy dog."
 for i in 1 2 3 4 5 6 7 8 9 10
@@ -51,7 +45,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'reference merge' '
-       git merge -s recur "reference merge" HEAD master
+       git merge -s recursive "reference merge" HEAD master
 '
 
 test_expect_success rebase '