2021-05-23 21:18:09 -04:00
|
|
|
# Set the default behavior, in case people don't have core.autocrlf set.
|
2021-05-23 21:37:59 -04:00
|
|
|
<<<<<<< HEAD
|
2021-05-23 21:37:27 -04:00
|
|
|
* text=auto
|
|
|
|
|
|
|
|
|
|
# Explicitly declare text files you want to always be normalized and converted
|
|
|
|
|
# to native line endings on checkout.
|
|
|
|
|
*.c text
|
|
|
|
|
*.h text
|
|
|
|
|
|
|
|
|
|
# Declare files that will always have CRLF line endings on checkout.
|
|
|
|
|
*.sln text eol=crlf
|
|
|
|
|
|
|
|
|
|
# Denote all files that are truly binary and should not be modified.
|
|
|
|
|
*.png binary
|
2021-05-23 21:37:59 -04:00
|
|
|
*.jpg binary
|
|
|
|
|
=======
|
2021-05-23 21:33:15 -04:00
|
|
|
* text eol=crlf
|
2021-05-23 21:37:59 -04:00
|
|
|
>>>>>>> 543689e4ff503897e2e276ee4b29f8ee791c123a
|
