summaryrefslogtreecommitdiff
path: root/t/t4018/php-function
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-01-20 22:52:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-20 22:52:50 -0800
commitfe2f4d0031efea524163d63888c010fc6a8201e1 (patch)
treec314369e73e8d5a436cbd5d6b0fc9c03049e0026 /t/t4018/php-function
parentMerge branch 'en/ort-conflict-handling' into en/merge-ort-perf (diff)
parentmerge-ort: fix a directory rename detection bug (diff)
downloadtgif-fe2f4d0031efea524163d63888c010fc6a8201e1.tar.xz
Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
* en/ort-directory-rename: (28 commits) merge-ort: fix a directory rename detection bug merge-ort: process_renames() now needs more defensiveness merge-ort: implement apply_directory_rename_modifications() merge-ort: add a new toplevel_dir field merge-ort: implement handle_path_level_conflicts() merge-ort: implement check_for_directory_rename() merge-ort: implement apply_dir_rename() and check_dir_renamed() merge-ort: implement compute_collisions() merge-ort: modify collect_renames() for directory rename handling merge-ort: implement handle_directory_level_conflicts() merge-ort: implement compute_rename_counts() merge-ort: copy get_renamed_dir_portion() from merge-recursive.c merge-ort: add outline of get_provisional_directory_renames() merge-ort: add outline for computing directory renames merge-ort: collect which directories are removed in dirs_removed merge-ort: initialize and free new directory rename data structures merge-ort: add new data structures for directory rename detection merge-ort: add implementation of type-changed rename handling merge-ort: add implementation of normal rename handling merge-ort: add implementation of rename collisions ...
Diffstat (limited to 't/t4018/php-function')
0 files changed, 0 insertions, 0 deletions