]> granicus.if.org Git - python/commit
remove merge=union attribute for Misc/NEWS (GH-460) (GH-989)
authorMariatta <Mariatta@users.noreply.github.com>
Tue, 4 Apr 2017 12:49:31 +0000 (14:49 +0200)
committerGitHub <noreply@github.com>
Tue, 4 Apr 2017 12:49:31 +0000 (14:49 +0200)
commitd7564e538c2573105727a209f51c6db26259317b
tree92bac663ceac7d5b57a10780ed68fec5c7834a21
parent23d6eb656ec29140fcca1c9261b7953e2312b171
remove merge=union attribute for Misc/NEWS (GH-460) (GH-989)

(cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba)
.gitattributes