Merge branch 'mp/t7060-diff-index-test'

Fix an old test that was doing the same thing as another one. * mp/t7060-diff-index-test: t7060: actually test "git diff-index --cached -M"