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 55a3f49922bf199b6ae108e557635938d53ff861..82694d81f276b2c59a0a93a4f678e1852e625052 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,3 @@
-Misc/NEWS   merge=union
-
 *.pck binary
 Lib/test/cjkencodings/* binary
 Lib/test/decimaltestdata/*.decTest binary