Subject: Re: [PATCH 09/48] t6036: criss-cross with weird content can fool git into clean merge

From: Junio C Hamano <[email-masked]>
Date: Mon, 18 Jul 2011 16:38:19 -0700

Elijah Newren <[email-masked]> 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.