From 3f3d0364a91aa8b89e175a49f93ad04dd4676186 Mon Sep 17 00:00:00 2001
From: INADA Naoki <methane@users.noreply.github.com>
Date: Tue, 21 Feb 2017 18:17:06 +0900
Subject: Reduce conflict on Misc/NEWS (GH-212)

use "union" merge strategy for Misc/NEWS.
---
 .gitattribute | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattribute

diff --git a/.gitattribute b/.gitattribute
new file mode 100644
index 0000000..253cc6d
--- /dev/null
+++ b/.gitattribute
@@ -0,0 +1 @@
+Misc/NEWS   merge=union
-- 
cgit v0.12