1
0
mirror of synced 2026-10-23 07:08:55 +03:00

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:
Dave Page
2026-09-21 12:51:22 +01:00
parent a2439b78f5
commit 7c6fb89b82
2 changed files with 528 additions and 524 deletions

4
.gitattributes vendored
View File

@@ -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

1048
Make.bat

File diff suppressed because it is too large Load Diff