summaryrefslogtreecommitdiff
path: root/t/t5300-pack-object.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-01-19 19:53:45 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-20 22:18:55 -0800
commitfa5e06d6902003f5f115b7497030b5c66537726e (patch)
treec0a9354dfe4409ff86ec1b064ac9e910c07456d9 /t/t5300-pack-object.sh
parentmerge-ort: implement handle_directory_level_conflicts() (diff)
downloadtgif-fa5e06d6902003f5f115b7497030b5c66537726e.tar.xz
merge-ort: modify collect_renames() for directory rename handling
collect_renames() is similar to merge-recursive.c's get_renames(), but lacks the directory rename handling found in the latter. Port that code structure over to merge-ort. This introduces three new die-not-yet-implemented functions that will be defined in future commits. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5300-pack-object.sh')
0 files changed, 0 insertions, 0 deletions