cpython (original) (raw)

ref: https://github.com/python/cpython/pull/209/files#r103190115

git cherry-pick picks up 4 entries, while cherry-picked commit only adds one entry.

Without this merge=union, git cherry-pick reports conflict. So we can remove
entries unintentionally merged.
But with this merge=union, git cherry-pick merges all entries without reporting any conflict.

We must not use this for maintenance branch.
Since we don't use cherry-pick on master branch, it's not so big problem for now.
But we must remove .gitattributes when 3.7 branch created.
Hopefully, we can remove it right after some tool to manage NEWS is introduced. (python/core-workflow#6)