Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 83e917b9180814754f967164d8742b244a1257ae..7117b57ccc9e20a2a6f4d10705b8a5665db8b30e 100755 (executable)
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -76,7 +76,7 @@ Merge made by the 'recursive' strategy.
  create mode 100644 c5.c
 EOF
 
-test_expect_failure 'merge reduces irrelevant remote heads' '
+test_expect_success 'merge reduces irrelevant remote heads' '
        GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
        test_cmp expected actual
 '