From 54cd9631c334ea48ee3493e5fb82ce5ba1dffeac Mon Sep 17 00:00:00 2001
From: Chris Warrick <kwpolska@gmail.com>
Date: Sun, 15 Apr 2018 16:57:05 +0200
Subject: [PATCH] Union merging for CHANGES.txt

https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

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