cherry-pick: add tests for new --ff option

diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 353f5430f0512cede0c903940061f795674a4122..16408244d25a91a7593c06e0fe9efa4fee66ffe5 100755 (executable)
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -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 'commit made to merged branch is reachable from the merge' '
+test_expect_success 'commit made to merged branch is reachable from the merge' '
        before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2")
        merge_commit=$(git rev-list --all --grep="Merge trunk to b2")
        not_reachable=$(git rev-list -1 $before_commit --not $merge_commit)