Mirrors
/
cpython
mirror of https://github.com/python/cpython
3
0
Fork 0
Code Releases Activity
Browse Source

Reduce conflict on Misc/NEWS (GH-212) 

use "union" merge strategy for Misc/NEWS.
pull/213/head
INADA Naoki 10 years ago
committed by GitHub
parent
32e8f9bdfd
commit
3f3d0364a9
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitattribute

1
.gitattribute
View File

@ -0,0 +1 @@
Misc/NEWS merge=union
Write Preview
Loading…
Cancel
Save