[issue29978] Remove remove merge=union attribute for Misc/NEWS in 3.6 and 2.7

Changes by Mariatta Wijaya : -- resolution: -> fixed stage: needs patch -> resolved status: open -> closed ___ Python tracker ___ ___

[issue29978] Remove remove merge=union attribute for Misc/NEWS in 3.6 and 2.7

Changes by Mariatta Wijaya : -- pull_requests: +1160 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://ma

[issue29978] Remove remove merge=union attribute for Misc/NEWS in 3.6 and 2.7

Changes by Mariatta Wijaya : -- pull_requests: +1159 ___ Python tracker ___ ___ Python-bugs-list mailing list Unsubscribe: https://ma

[issue29978] Remove remove merge=union attribute for Misc/NEWS in 3.6 and 2.7

New submission from Mariatta Wijaya: In https://github.com/python/cpython/pull/212, merge=union was added to the .gitattributes, but was later removed in https://github.com/python/cpython/pull/460. Somehow this attribute made their way into 3.6 and 2.7. I will remove it. -- assignee: