From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Feb 2011 23:10:46 GMT
Subject: Re: [RFC/PATCH 1/2] Introduce CHERRY_HEAD
Message-ID: <7vzkpwlwqx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTimZUhxkxuUMubmPxjd8MG0Pu=9mrLoPqi=MpPWZ@mail.gmail.com>

Bert Wesarg <bert.wesarg@googlemail.com> writes:

>> What happened to the `=======`?  I thought you were copying and pasting
>> from the said section.
>
> I think this is clear enough, else you would need to mention the
> '|||||||' and conflict_marker_size too.

If so then probably the section this was copied from needs updating?