From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 01 Feb 2017 23:28:49 GMT
Subject: Re: [PATCH] merge-recursive: make "CONFLICT (rename/delete)" message show both paths
Message-ID: <xmqqa8a5mqxa.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1485991441.28767.2.camel@mattmccutchen.net>

Matt McCutchen <matt@mattmccutchen.net> writes:

> On Wed, 2017-02-01 at 12:56 -0800, Junio C Hamano wrote:
>
>> Let me make sure if I understood your changes correctly:
>>  ...
>> So the condition to guard the call to update_file() also looks
>> correct to me.
>
> All of the above matches my understanding.  Would it have saved you
> time if I had included some of this explanation in the patch "cover
> letter"?

The fact that I arrived at the same understanding by reading the
change without peeking at such a cheat-sheet gives me more peace of
mind ;-)

Thanks.