From de5fb378ac408e472d8d50bba2eb99f76d98a154 Mon Sep 17 00:00:00 2001
From: John Backus <johncbackus@gmail.com>
Date: Sat, 15 Oct 2016 19:32:28 -0700
Subject: [PATCH] Change merge driver for Changelog.md to union

See bbatsov/rubocop#3594 for context on what this is and how it works
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

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