From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 29 Nov 2020 10:23:34 GMT
Subject: Re: [PATCH 05/20] merge-ort: add an err() function similar to one from merge-recursive
Message-ID: <87im9ojwbd.fsf@evledraar.gmail.com>
In-Reply-To: <91516799e46ebbc91fb6b1811164fe7c9a15a3ad.1606635803.git.gitgitgadget@gmail.com>


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".