From: INADA Naoki <methane@users.noreply.github.com>
Date: Tue, 21 Feb 2017 09:17:06 +0000 (+0900)
Subject: Reduce conflict on Misc/NEWS (GH-212)
X-Git-Tag: v3.7.0a1~1310
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f3d0364a91aa8b89e175a49f93ad04dd4676186;p=python

Reduce conflict on Misc/NEWS (GH-212)

use "union" merge strategy for Misc/NEWS.
---

diff --git a/.gitattribute b/.gitattribute
new file mode 100644
index 0000000000..253cc6dee4
--- /dev/null
+++ b/.gitattribute
@@ -0,0 +1 @@
+Misc/NEWS   merge=union