Re: [PATCH v3 22/33] merge-recursive: check for directory level conflicts

> + /* We can assume it's not rename/rename(1to1) because > +* that was case (1), already checked above. So we > +* know that head_ent->new_dir and merge_ent->new_dir > +* are different strings. > +

[PATCH v3 22/33] merge-recursive: check for directory level conflicts

Before trying to apply directory renames to paths within the given directories, we want to make sure that there aren't conflicts at the directory level. There will be additional checks at the individual file level too, which will be added later. Signed-off-by: Elijah Newren --- merge-recursive.