"Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > @@ -2314,7 +2335,8 @@ static char *check_for_directory_rename(struct merge_options *opt, > } > > new_path = handle_path_level_conflicts(opt, path, side_index, > - rename_info, collisions); > + rename_info, > + &collisions[side_index]); Is this a fix of a latent bug? handle_path_level_conflicts() is not changed in this patch.
