Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'

diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index dc3478fbbc8cc52bb2877806164e75559aff9824..359eeaa738e28c6a3eb2ced6c0f24bbd8992ec4f 100755 (executable)
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -15,13 +15,13 @@ test_expect_success 'load svn dump' "
        git svn fetch --all
        "
 
-test_expect_failure 'all svn merges became git merge commits' '
+test_expect_success 'all svn merges became git merge commits' '
        unmarked=$(git rev-list --parents --all --grep=Merge |
                grep -v " .* " | cut -f1 -d" ")
        [ -z "$unmarked" ]
        '
 
-test_expect_failure 'cherry picks did not become git merge commits' '
+test_expect_success 'cherry picks did not become git merge commits' '
        bad_cherries=$(git rev-list --parents --all --grep=Cherry |
                grep " .* " | cut -f1 -d" ")
        [ -z "$bad_cherries" ]
@@ -33,7 +33,7 @@ test_expect_success 'svn non-merge merge commits did not become git merge commit
        [ -z "$bad_non_merges" ]
        '
 
-test_expect_failure 'everything got merged in the end' '
+test_expect_success 'everything got merged in the end' '
        unmerged=$(git rev-list --all --not master)
        [ -z "$unmerged" ]
        '