From 6f414b6a36b8e07805ccf847ea1c2450fbc676e3 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Mon, 4 Aug 2014 10:13:56 -0500
Subject: [PATCH] Enable union merge for NEWS.md

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

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