Allow merging CHANGES.rst with union strategy.

Should cause fewer merge conflicts. See issue #1008. [ci skip]
plone · Sep 16, 2015 · a588a17 · a588a17
1 parent b3fa683
commit a588a17
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.rst merge=union