From fdccd36ed864dcbb52ff992f1fdf1cc48d1db66a Mon Sep 17 00:00:00 2001
From: Michal Cichra <michal@cichra.cz>
Date: Tue, 14 Mar 2017 12:26:53 +0100
Subject: [PATCH] [git] allow merge=union on the changelog file

so changelogs are easier rebased
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..a19ade077
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union