From 0664a3f2ddfc227797b5a8f0654e9959b15d9e64 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 12 Sep 2016 21:55:17 +0300
Subject: [PATCH] Set merge strategy for CHANGES

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..8383fff9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGES merge=union