From 02f47b519c4756c431d18a64ac4a0d948dc9cb90 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 15 Sep 2018 20:49:19 +0200
Subject: [PATCH] Add gitattributes for changelog

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..9556c6763
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+doc/changelog.asciidoc merge=union