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

Reduce conflict on Misc/NEWS (GH-212) 

use "union" merge strategy for Misc/NEWS.
This commit is contained in:
INADA Naoki 2017-02-21 18:17:06 +09:00 committed by GitHub
parent 32e8f9bdfd
commit 3f3d0364a9
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattribute Normal file
View File

@ -0,0 +1 @@
Misc/NEWS merge=union