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

2 lines
24 B
Plaintext
Raw Normal View History

Reduce conflict on Misc/NEWS (GH-212) use "union" merge strategy for Misc/NEWS.
2017-02-21 05:17:06 -04:00
Misc/NEWS merge=union