Merge branch 'rh/merge-options-doc-fix' into maint

diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index 5287f6af32766130df8a0df404218fc45fdaa592..dd5b0e55d26b0f9258ae47425050083abe385fc0 100755 (executable)
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -81,7 +81,7 @@ test_expect_success 'rev-list F...I' '
        test_cmp expect actual
 '
 
-test_expect_failure 'rev-list --ancestry-path F...I' '
+test_expect_success 'rev-list --ancestry-path F...I' '
        for c in F H I; do echo $c; done >expect &&
        git rev-list --ancestry-path --format=%s F...I |
        sed -e "/^commit /d" |