Merge branch 'en/test-cleanup'

Test fixes. * en/test-cleanup: t6022, t6046: fix flaky files-are-updated checks

Junio C Hamano committed Mar 16, 2020 at 12:43 UTC 74f172e39e2eadb48f1cac1dcda363d6b692c21f

No changes.