From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Feb 2016 05:10:17 GMT
Subject: Re: Custom merge driver with no rename detection
Message-ID: <xmqqpovyr22u.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CALMa68ovz=VZYkCcUDvEn1d7=xJDx__71caqsPXUFASZ1phfdw@mail.gmail.com>

Felipe Gonçalves Assis <felipeg.assis@gmail.com> writes:

> The usual workaround is using the resolve strategy, but apparently it
> ignores the custom merge driver.

Hmph.

Indeed, git-merge-file seems to call xdl_merge() directly, bypassing
the ll_merge(), which is understandable as the former predates the
latter.  That needs to be fixed, I think.