Merge branch 'do/maint-merge-recursive-fix' into maint

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 67f983fea405934c779eb5507182b02811081450..64502e2be762a82b65a72af6847d5a3b79303d45 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -342,7 +342,7 @@ cat > expect <<\EOF
 * initial
 EOF
 
-test_expect_sucess 'log --graph with merge' '
+test_expect_success 'log --graph with merge' '
        git log --graph --date-order --pretty=tformat:%s |
                sed "s/ *$//" >actual &&
        test_cmp expect actual