mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 20:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

remove merge=union attribute for Misc/NEWS (GH-460) (GH-988)

Browse source 
(cherry picked from commit 060d2d776a)
This commit is contained in:
Mariatta 2017-04-04 11:49:14 +02:00 • committed by GitHub
parent cb1e002c07
commit ce92be1825
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitattributes vendored
View file

@ -1,5 +1,3 @@
Misc/NEWS merge=union
*.pck binary *.pck binary
Lib/test/cjkencodings/* binary Lib/test/cjkencodings/* binary
Lib/test/decimaltestdata/*.decTest binary Lib/test/decimaltestdata/*.decTest binary