From: Elijah Newren <newren@gmail.com>
Date: Mon, 08 Aug 2011 18:02:05 GMT
Subject: Re: [PATCH 09/48] t6036: criss-cross with weird content can fool git into clean merge
Message-ID: <CABPp-BHbXt=FJ4-wx6ci+xOAo0Ud_dwBpSkoaKvUVuSxhkjotg@mail.gmail.com>
In-Reply-To: <7vaacbdus4.fsf@alter.siamese.dyndns.org>

On Mon, Jul 18, 2011 at 5:38 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Elijah Newren <newren@gmail.com> writes:
>
>> +#   Commit E: file with contents:
>> +#      <<<<<<< Temporary merge branch 1
>> +#      C
>> +#      =======
>> +#      B
>> +#      >>>>>>> Temporary merge branch 2
>> +#
>> +# Now, when we merge commits D & E, does git detect the conflict?
>
> This is way too artificial that I personally feel not worth worrying
> about.

I wasn't going to try to do anything to fix it.  Should I drop this
patch from the series or is it worth keeping around for completeness?