From: Taylor Blau <me@ttaylorr.com>
Date: Wed, 12 Mar 2025 20:00:10 GMT
Subject: Re: [PATCH 1/3] merge-ort: add new merge_ort_generic() function
Message-ID: <Z9HnysAkF6P9uUg6@nand.local>
In-Reply-To: <Z9FAgCSCZSJnzv9d@pks.im>

On Wed, Mar 12, 2025 at 09:06:24AM +0100, Patrick Steinhardt wrote:
> These two hunks look related to my above observation that we don't have
> the check for `num_merge_bases == 1`, as in "merge-recursive.c" we used
> to set `opt->ancestor = "constructed merge base" if so.

Yeah, I noticed the same thing and agree that it would be helpful to see
that spelled out in the commit message.

Thanks,
Taylor