19 lines
493 B

# Set the default behavior, in case people don't have core.autocrlf set.
<<<<<<< HEAD
* 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
*.jpg binary
* text eol=crlf
>>>>>>> 543689e4ff503897e2e276ee4b29f8ee791c123a