From 3e7a8b5f85ca598e2d487a2a401326758337f10e Mon Sep 17 00:00:00 2001
From: Joe Nelson <begriffs@users.noreply.github.com>
Date: Sat, 8 Apr 2017 10:36:02 -0500
Subject: [PATCH] Use union merge strategy on changelog (#859)

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

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