Allowed union merge strategy in CHANGES.rst.

[ci skip]
zopefoundation · Oct 24, 2015 · dc30c8b · dc30c8b
1 parent c2c6b4d
commit dc30c8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.rst merge=union
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ __pycache__
 *.pyc
 *.pyo
 *.so
+!.gitattributes