Re: [PATCH v3 1/2] merge-file: let conflict markers match end-of-line style of the context

On Tue, Jan 26, 2016 at 1:04 AM, Johannes Schindelin
[off-list ref] 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.