summaryrefslogtreecommitdiff
path: root/t/t9601/cvsroot/module/added-imported.txt,v
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-01-19 19:53:50 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-20 22:18:55 -0800
commit05b85c6eeb1710ff83f11f71abefa2064e50e61b (patch)
tree5e44ec1210cdc265351fa2ddeff9c1198785da53 /t/t9601/cvsroot/module/added-imported.txt,v
parentmerge-ort: implement handle_path_level_conflicts() (diff)
downloadtgif-05b85c6eeb1710ff83f11f71abefa2064e50e61b.tar.xz
merge-ort: add a new toplevel_dir field
Due to the string-equality-iff-pointer-equality requirements placed on merged_info.directory_name, apply_directory_rename_modifications() will need to have access to the exact toplevel directory name string pointer and can't just use a new empty string. Store it in a field that we can use. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9601/cvsroot/module/added-imported.txt,v')
0 files changed, 0 insertions, 0 deletions