[Python-checkins] [python/cpython] 060d2d: remove merge=union attribute for Misc/NEWS (GH-460...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/python/cpython
  Commit: 060d2d776a29341c079cce37220324f9775140ba
      https://github.com/python/cpython/commit/060d2d776a29341c079cce37220324f9775140ba
  Author: INADA Naoki <methane at users.noreply.github.com>
  Date:   2017-03-05 (Sun, 05 Mar 2017)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  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)