From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Jan 2016 17:22:38 GMT
Subject: Re: [PATCH v3 1/2] merge-file: let conflict markers match end-of-line style of the context
Message-ID: <CAPc5daVc9nQ+V5itEKMHOzBiHzEoTw1-aoA+rr2n+X1w-1yCnw@mail.gmail.com>
In-Reply-To: <alpine.DEB.2.20.1601260955320.2964@virtualbox>

On Tue, Jan 26, 2016 at 1:04 AM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Not sure. You might end up with a very long line (containing plenty of LF
> "characters") and the conflict marker *at the end* of said line, with a
> CR/LF after it. I would not call that particularly helpful.
>
> Seeing as we really cannot do anything in this case, I thought it would be
> a good idea to avoid trying (and failing) to be smart here.

Nicely and clearly explained; thanks, and I agree with your reasoning.