[Python-checkins] [python/cpython] 3f3d03: Reduce conflict on Misc/NEWS (GH-212)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/python/cpython
  Commit: 3f3d0364a91aa8b89e175a49f93ad04dd4676186
      https://github.com/python/cpython/commit/3f3d0364a91aa8b89e175a49f93ad04dd4676186
  Author: INADA Naoki <methane at users.noreply.github.com>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    A .gitattribute

  Log Message:
  -----------
  Reduce conflict on Misc/NEWS (GH-212)

use "union" merge strategy for Misc/NEWS.