From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 May 2020 18:06:25 GMT
Subject: Re: What's cooking in git.git (May 2020, #05; Thu, 14)
Message-ID: <xmqqr1vlkr8e.fsf@gitster.c.googlers.com>
In-Reply-To: <CABPp-BF2Nh8LntDfw7-zSry00QKWg68qKOFW9QHvtqrSvU=Utw@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> This summary feels misleading; it's not simple rename + content merge,
> it's double rename + content merge.  Perhaps:
>
> When a binary file gets modified and renamed on both sides of history
> to different locations, both files would be written to the working
> tree but both would have the contents from "ours".  This has been
> corrected so that the path from each side gets their original content.

Thanks.