From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jul 2011 23:38:19 GMT
Subject: Re: [PATCH 09/48] t6036: criss-cross with weird content can fool git into clean merge
Message-ID: <7vaacbdus4.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1307518278-23814-10-git-send-email-newren@gmail.com>

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.