From: INADA Naoki <methane@users.noreply.github.com>
Date: Sat, 4 Mar 2017 23:49:45 +0000 (+0900)
Subject: remove merge=union attribute for Misc/NEWS (GH-460)
X-Git-Tag: v3.7.0a1~1204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=060d2d776a29341c079cce37220324f9775140ba;p=thirdparty%2FPython%2Fcpython.git

remove merge=union attribute for Misc/NEWS (GH-460)

Github doesn't support it (ref. isaacs/github#487).  So it can't ease
conflict on Github.

Additionally, it can make trouble when cherry-pick. (ref. GH-212)
---

diff --git a/.gitattributes b/.gitattributes
index 55a3f49922bf..82694d81f276 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,3 @@
-Misc/NEWS   merge=union
-
 *.pck binary
 Lib/test/cjkencodings/* binary
 Lib/test/decimaltestdata/*.decTest binary