summaryrefslogtreecommitdiffstats
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* [3.6] bpo-27425: Be more explicit in .gitattributes (GH-840) (GH-2083)Zachary Ware2017-06-101-6/+39
| | | Also updates checked-in line endings on some files
* remove merge=union attribute for Misc/NEWS (GH-460) (GH-988)Mariatta2017-04-041-2/+0
| | | (cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba)
* mark various test data binary (#233) (#304)Benjamin Peterson2017-02-261-0/+10