mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2026-10-30 16:20:04 -05:00
Dave Page
7c6fb89b82
.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.
7 lines
244 B
Plaintext
7 lines
244 B
Plaintext
# 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
|