On Sun, Nov 29 2020, Elijah Newren via GitGitGadget wrote:
> static int collect_merge_info(struct merge_options *opt,
> struct tree *merge_base,
> struct tree *side1,
> struct tree *side2)
> {
> + /* TODO: Implement this using traverse_trees() */
> die("Not yet implemented.");
> }
>
Looks like this doesn't belong in this patch & should instead be
squashed into "[PATCH 02/20] merge-ort: add some high-level algorithm
structure".
