| commit | 9c5bef3b358b12b9af5d54014f4efc62588f5df1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Dec 2021 17:39:47 +0000 (15 09:39 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Dec 2021 17:39:47 +0000 (15 09:39 -0800) | ||
| tree | 94cfe5d36b694e3d6b67e291379ef631501c328b | treesnapshot (tar.gz zip) |
| parent | 4ce498baa3976cf96d3feb4215a486dd47ec2e7b | commitdiff |
| parent | 911e9e88abeceb23fd6780d2cb6cf623957290a4 | commitdiff |
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
Test update.
* hn/t1404-df-limitation-is-ref-files-only:
t1404: mark directory/file conflict tests with REFFILES