Allowed union merge strategy in CHANGES.rst.

[ci skip]
2015-10-24 23:48:10 +02:00 · 2015-10-24 23:48:10 +02:00 · d1150e46db
commit d1150e46db
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+CHANGES.rst merge=union
--- a/.gitignore
+++ b/.gitignore
@ -16,4 +16,5 @@ lib/
 lib64
 parts/
 src/icalendar.egg-info/
+!.gitattributes
 !.gitignore