diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
| commit | 9c5bef3b358b12b9af5d54014f4efc62588f5df1 (patch) | |
| tree | 94cfe5d36b694e3d6b67e291379ef631501c328b /object-file.c | |
| parent | Merge branch 'en/zdiff3' (diff) | |
| parent | t1404: mark directory/file conflict tests with REFFILES (diff) | |
| download | git-9c5bef3b358b12b9af5d54014f4efc62588f5df1.tar.gz git-9c5bef3b358b12b9af5d54014f4efc62588f5df1.zip | |
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
Diffstat (limited to 'object-file.c')
0 files changed, 0 insertions, 0 deletions