summaryrefslogtreecommitdiff
path: root/Documentation/glossary-content.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-01-19 19:53:47 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-20 22:18:55 -0800
commitfbcfc0cc17019da292c4aeef0fe43a8980207beb (patch)
tree118577fa4bf860d430d7beedae443f149d5b3b76 /Documentation/glossary-content.txt
parentmerge-ort: implement compute_collisions() (diff)
downloadtgif-fbcfc0cc17019da292c4aeef0fe43a8980207beb.tar.xz
merge-ort: implement apply_dir_rename() and check_dir_renamed()
Both of these are copied from merge-recursive.c, with just minor tweaks due to using strmap API and not having a non_unique_new_dir field. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/glossary-content.txt')
0 files changed, 0 insertions, 0 deletions