4 Commits

Author	SHA1	Message	Date
Zachary Ware	6b6e687766	bpo-27425: Be more explicit in .gitattributes (GH-840) ... Updates checked-in line endings on several files.	2017-06-10 14:58:42 -05:00
INADA Naoki	060d2d776a	remove merge=union attribute for Misc/NEWS (GH-460) ... Github doesn't support it (ref. isaacs/github#487). So it can't ease conflict on Github. Additionally, it can make trouble when cherry-pick. (ref. GH-212)	2017-03-05 08:49:45 +09:00
Benjamin Peterson	2771304357	mark various test data binary (#233)	2017-02-22 22:38:48 -08:00
INADA Naoki	2c700af5a7	.gitattribute -> .gitattributes (GH-213)	2017-02-21 18:39:41 +09:00