From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 03 Jul 2018 19:57:45 GMT
Subject: Re: [PATCH v2 6/9] merge-recursive: fix assumption that head tree being merged is HEAD
Message-ID: <xmqq1sckqeh2.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180701012503.14382-7-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> `git merge-recursive` does a three-way merge between user-specified trees
> base, head, and remote.  Since the user is allowed to specify head, we can
> not necesarily assume that head == HEAD.

Makes sense.