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)

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)
060d2d77 · INADA Naoki · GitHub · 6abaed0d · 060d2d77
Commit 060d2d77 authored Mar 05, 2017 by INADA Naoki Committed by GitHub Mar 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

.gitattributes .gitattributes +0 -2

No files found.
--- a/.gitattributes
+++ b/.gitattributes
-Misc/NEWS   merge=union
-
 *.pck binary
 Lib/test/cjkencodings/* binary
 Lib/test/decimaltestdata/*.decTest binary