summaryrefslogtreecommitdiff
path: root/t/t4037-diff-r-t-dirs.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-12-15 09:39:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-15 09:39:47 -0800
commit9c5bef3b358b12b9af5d54014f4efc62588f5df1 (patch)
tree94cfe5d36b694e3d6b67e291379ef631501c328b /t/t4037-diff-r-t-dirs.sh
parentMerge branch 'en/zdiff3' (diff)
parentt1404: mark directory/file conflict tests with REFFILES (diff)
downloadtgif-9c5bef3b358b12b9af5d54014f4efc62588f5df1.tar.xz
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 't/t4037-diff-r-t-dirs.sh')
0 files changed, 0 insertions, 0 deletions