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

Tue Apr 4 08:49:33 EDT 2017

  Branch: refs/heads/2.7
  Home:   https://github.com/python/cpython
  Commit: d7564e538c2573105727a209f51c6db26259317b
      https://github.com/python/cpython/commit/d7564e538c2573105727a209f51c6db26259317b
  Author: Mariatta <Mariatta at users.noreply.github.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  remove merge=union attribute for Misc/NEWS (GH-460) (GH-989)

(cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba)