➜

This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author Mariatta
Recipients Mariatta
Date 2017-04-04.08:40:53
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1491295254.15.0.485735428902.issue29978@psf.upfronthosting.co.za>
In-reply-to
Content 
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.
History
Date User Action Args
2017-04-04 08:40:54Mariattasetrecipients: + Mariatta
2017-04-04 08:40:54Mariattasetmessageid: <1491295254.15.0.485735428902.issue29978@psf.upfronthosting.co.za>
2017-04-04 08:40:54Mariattalinkissue29978 messages
2017-04-04 08:40:53Mariattacreate