CMake/.gitattributes
Brad King da60adc363 Tell Git to use a distinct conflict marker size in .rst files
Use a long conflict marker size that is unlikely to be in conflict
with a `=======` section header underline.
2016-05-16 16:04:46 -04:00

26 lines
658 B
Plaintext

.gitattributes export-ignore
.hooks* export-ignore
bootstrap crlf=input
configure crlf=input
*.[1-9] crlf=input
*.sh crlf=input
*.sh.in crlf=input
*.bat -crlf
*.bat.in -crlf
*.dsp -crlf
*.dsw -crlf
*.pfx -crlf
*.png -crlf
*.sln -crlf
*.vcproj -crlf
*.c whitespace=tab-in-indent
*.h whitespace=tab-in-indent
*.cxx whitespace=tab-in-indent
*.txt whitespace=tab-in-indent
*.cmake whitespace=tab-in-indent
*.rst whitespace=tab-in-indent conflict-marker-size=79