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: Mariatta messages: 291115 nosy: Mariatta priority: normal severity: normal stage: needs patch status: open title: Remove remove merge=union attribute for Misc/NEWS in 3.6 and 2.7 versions: Python 2.7, Python 3.6 _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue29978> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
