Keep Make.bat stored with CRLF
.gitattributes normalises everything to LF, which rewrote the whole file the first time this branch touched it and turned a two-line merge into a whole-file conflict. Make.bat has been stored with CRLF since long before that rule, so it is marked -text to leave it that way.
This commit is contained in:
4
.gitattributes
vendored
4
.gitattributes
vendored
@@ -1,2 +1,6 @@
|
||||
# Auto detect text files and normalize end of lines to LF (\n)
|
||||
* text=auto eol=lf
|
||||
|
||||
# Make.bat has always been stored with CRLF; the blanket eol=lf above would
|
||||
# silently rewrite the whole file the first time anything touches it.
|
||||
Make.bat -text
|
||||
|
||||
Reference in New Issue
Block a user