From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 05 Aug 2020 22:26:47 GMT
Subject: Re: [PATCH] sequencer: avoid garbled merge machinery messages due to commit labels
Message-ID: <xmqq8sesn2zc.fsf@gitster.c.googlers.com>
In-Reply-To: <20200805212032.GK9546@syl.lan>

Taylor Blau <me@ttaylorr.com> writes:

>> ...
>>     <<<<<<<< HEAD:foo.c
>>       int j;
>>     ========
>>       int counter;
>>     >>>>>>>> b01dface (Removed unnecessary stuff):bar.c
>>
>>     CONFLICT (rename/delete): foo.c deleted in b01dface (Removed
>>     unnecessary stuff) and renamed in HEAD.  Version HEAD of foo.c left
>>     in tree.
>>
>>     CONFLICT (file location): dir1/foo.c added in b01dface (Removed
>>     unnecessary stuff) inside a directory that was renamed in HEAD,
>>     suggesting it should perhaps be moved to dir2/foo.c.
>>
>> Signed-off-by: Elijah Newren <newren@gmail.com>
>
> This is much easier to read, and the change below is obviously correct.
> Thanks for working to improve the readability of these markers.
>
>   Reviewed-by: Taylor Blau <me@ttaylorr.com>

Thanks.  Looks good.