summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* [2.7] bpo-27425: Be more explicit in .gitattributes (GH-840) (GH-2086)Zachary Ware2017-06-111-6/+40
| | | Also updates checked-in line endings in several files.
* remove merge=union attribute for Misc/NEWS (GH-460) (GH-989)Mariatta2017-04-041-2/+0
| | | (cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba)
* mark various test data binary (#233) (#303)Benjamin Peterson2017-02-251-0/+10