Johannes Schindelin <johannes.schinde...@gmx.de> writes: > We actually do not have to look at the *entire* context at all: if the > files are all LF-only, or if they all have CR/LF line endings, it is > sufficient to look at just a *single* line to match that style. And if > the line endings are mixed anyway, it is *still* okay to imitate just a > single line's eol: we will just add to the pile of mixed line endings, > and there is nothing we can do about that.
Isn't there one thing we can do still? If we use CRLF for the marker lines when the content is already mixed, I'd think it would help Notepad (not necessary for Notepad2 or Wordpad IIUC) by making sure that they can see where the marker lines end correctly. I do not care too deeply about this; just throwing it out as a possibility to help Windowsy folks a bit more. > Note that while it is true that there have to be at least two lines we > can look at (otherwise there would be no conflict), the same is not true > for line *endings*: the three files in question could all consist of a > single line without any line ending, each. In this case we fall back to > using LF-only. Yeah, this is tricky, and from the same "helping Notepad that concatenates lines with LF-only" perspective I should perhaps be suggesting to use CRLF in such a case, too, but I would say we should not do so. Three variants of a LF-only file may have conflict at the incomplete last line, and if we only look at their "no EOL"-ness and decide to add CRLF to the result, that would be irritatingly wrong. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
