django/.gitattributes

# Normalize line endings to avoid spurious failures in the core test suite on Windows.
*html text eol=lf
*css text eol=lf
tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
tests/staticfiles_tests/project/documents/test/*txt text eol=lf
docs/releases/*.txt merge=union
Fixed #18920 -- Added `.gitattributes` to normalize line endings in HTML templates and avoid spurious failures in the core test suite on Windows. Many thanks to manfre, Claude Paroz, Karen Tracey, MaxV and Daniel Langer for their advising and testing. 2012-11-21 10:19:00 +01:00			`# Normalize line endings to avoid spurious failures in the core test suite on Windows.`
Force Unix-style line-endings for some helper files in staticfiles_tests. This fixes eight failures in the cached storage tests under Windows. Refs #18920 and 978d4476cf. 2013-09-30 19:22:26 -03:00			`*html text eol=lf`
			`*css text eol=lf`
			`tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf`
			`tests/staticfiles_tests/project/documents/test/*txt text eol=lf`
Added git attribute merge=union for release notes 2015-06-02 16:11:19 +01:00			`docs/releases/*.txt merge=union`