Re: [PATCH 2/3] merge-ort: shuffle the computation and cleanup of potential collisions
From: Jonathan Tan <hidden>
Date: 2022-06-27 18:48:52
"Elijah Newren via GitGitGadget" [off-list ref] writes:
quoted hunk ↗ jump to hunk
@@ -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.