From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Aug 2019 21:05:03 GMT
Subject: Re: [PATCH v3 03/24] merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
Message-ID: <xmqqtvagzurk.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190815214053.16594-4-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> We always want our conflict hunks to be labelled so that users can know
> where each came from.  The previous commit fixed the one caller in the
> codebase which was not setting opt->ancestor (and thus not providing a
> label for the "merge base" conflict hunk in diff3-style conflict
> markers); add an assertion to prevent future codepaths from also
> overlooking this requirement.

Makes sense.