diff options
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 82162cb8d..6e1de1b3d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,9 @@ +# Line endings for Windows scripts * text=auto tools/win32build/nsis_scripts/*.nsi.in eol=crlf # Numerical data files numpy/lib/tests/data/*.npy binary + +# Release notes, reduce number of conflicts. +doc/release/*.rst merge=union |