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

methane · Mariatta · commit 4f00380b38c5 · 2017-04-04T10:56:23.000+02:00
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. pythonGH-212) (cherry picked from commit 060d2d7)
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,3 @@
-Misc/NEWS   merge=union
-
 *.pck binary
 Lib/test/cjkencodings/* binary
 Lib/test/decimaltestdata/*.decTest binary

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-Misc/NEWS merge=union`
`2`		`-`
`3`	`1`	`*.pck binary`
`4`	`2`	`Lib/test/cjkencodings/* binary`
`5`	`3`	`Lib/test/decimaltestdata/*.decTest binary`