Merge branch 'mh/html-path'

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 2a2b6b63d50313775226d6fe55bca846a067a263..3d6db4d386a0a009892fac490818294664d188fa 100755 (executable)
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -58,7 +58,7 @@ test_expect_success 'checkout' '
        grep "have 1 and 1 different" actual
 '
 
-test_expect_failure 'checkout with local tracked branch' '
+test_expect_success 'checkout with local tracked branch' '
        git checkout master &&
        git checkout follower >actual
        grep "is ahead of" actual