Merge branch 'jc/doc-gc-prune-now' into maint

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 741ec085767c9469f8ba15408af37cd558df1559..32d81765cb53718e5d26092ccfe970a503edfa02 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -106,7 +106,7 @@ test_expect_success 'git diff-index --cached -M shows 2 added + 1 unmerged' '
        A       THREE
        A       TWO
        EOF
-       git diff-index --cached --name-status HEAD >actual &&
+       git diff-index --cached -M --name-status HEAD >actual &&
        test_cmp expected actual
 '