From 69cc6a7f254a25c3e2876226a6b8ed0c68adebcd Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Sun, 25 Oct 2015 00:00:19 +0200
Subject: [PATCH] Allowed union merge strategy in CHANGES.rst.

[ci skip]
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 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