Use union merge for NEWS.md file

This automatically add lines from multiple PR when merging, instead of triggering conflicts.
9 years ago · d0371d2478
parent fec4073f3b
commit d0371d2478
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+NEWS.md merge=union