From d1150e46db75c770a432bf0ab4a816b30f78e52d Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Sat, 24 Oct 2015 23:48:10 +0200
Subject: [PATCH] Allowed union merge strategy in CHANGES.rst.

[ci skip]
---
 .gitattributes | 1 +
 .gitignore     | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6f9ff67
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.rst merge=union
diff --git a/.gitignore b/.gitignore
index 2c2c588..0a48514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ lib/
 lib64
 parts/
 src/icalendar.egg-info/
+!.gitattributes
 !.gitignore