diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-19 19:53:48 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-20 22:18:55 -0800 |
| commit | 47325e8533a35ee48e85f85543e4f054d21a36c1 (patch) | |
| tree | f31a14d5b7303fe98e6306ade19285e33f3fc544 /Documentation/RelNotes/2.10.1.txt | |
| parent | merge-ort: implement apply_dir_rename() and check_dir_renamed() (diff) | |
| download | tgif-47325e8533a35ee48e85f85543e4f054d21a36c1.tar.xz | |
merge-ort: implement check_for_directory_rename()
This is copied from merge-recursive.c, with minor tweaks due to using strmap
API and the fact that it can use opt->priv->paths to get all pathnames that
exist instead of taking a tree object.
This depends on a new function, handle_path_level_conflicts(), which
just has a placeholder die-not-yet-implemented implementation for now; a
subsequent patch will implement it.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.10.1.txt')
0 files changed, 0 insertions, 0 deletions