Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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)
This commit is contained in:
INADA Naoki 2017-03-05 08:49:45 +09:00 committed by GitHub
parent 6abaed0dda
commit 060d2d776a
1 changed files with 0 additions and 2 deletions
Show Stats 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