summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: dad6dde37cd0fc6ebc4856423cbd194fd8a7a704 (plain)
1
2
3
4
5
# Numerical data files
numpy/lib/tests/data/*.npy binary

# Release notes, reduce number of conflicts.
doc/release/*.rst merge=union