Skip to content

Commit 3f3d036

Browse files
methanemethane
authored
Reduce conflict on Misc/NEWS (pythonGH-212)
use "union" merge strategy for Misc/NEWS.
1 parent 32e8f9b commit 3f3d036

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

‎.gitattribute‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Misc/NEWS merge=union

0 commit comments

Comments
 (0)