Elijah Newren fa5e06d690 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>

2021-01-20 22:18:55 -08:00

76 KiB

Raw Blame History

View Raw