Re: [PATCH 1/3] merge-ort: copy a few small helper functions from merge-recursive.c
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 16 quoted lines
> From: Elijah Newren <newren@gmail.com>
>
> In a subsequent commit, we will implement the traditional recursiveness
> that gave merge-recursive its name, namely merging non-unique
> merge-bases to come up with a single virtual merge base. Copy a few
> helper functions from merge-recursive.c that we will use in the
> implementation.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ...
> @@ -1462,5 +1492,7 @@ void merge_incore_recursive(struct merge_options *opt,
> struct commit *side2,
> struct merge_result *result)
> {
> + (void)reverse_commit_list;
> + (void)make_virtual_commit;To keep these symbols referenced? Cute ;-)
> die("Not yet implemented");
> }