Merge branch 'sb/opt-filename'

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 67f983fea405934c779eb5507182b02811081450..aad3894ad4c542d4ab894c2d57a035a89eb88258 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -324,14 +324,12 @@ cat > expect <<\EOF
 * | | |   Merge branch 'side'
 |\ \ \ \
 | * | | | side-2
-| | | |/
-| | |/|
+| | |_|/
 | |/| |
 | * | | side-1
 * | | | Second
 * | | | sixth
-| | |/
-| |/|
+| |_|/
 |/| |
 * | | fifth
 * | | fourth
@@ -342,7 +340,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