Merge branch 'hn/t1404-df-limitation-is-ref-files-only'

Test update. * hn/t1404-df-limitation-is-ref-files-only: t1404: mark directory/file conflict tests with REFFILES

Junio C Hamano committed Dec 15, 2021 at 09:39 UTC 9c5bef3b358b12b9af5d54014f4efc62588f5df1

No changes.