]> granicus.if.org Git - python/commit
remove merge=union attribute for Misc/NEWS (GH-460) (GH-988)
authorMariatta <Mariatta@users.noreply.github.com>
Tue, 4 Apr 2017 09:49:14 +0000 (11:49 +0200)
committerGitHub <noreply@github.com>
Tue, 4 Apr 2017 09:49:14 +0000 (11:49 +0200)
commitce92be1825c5ca1d3e6bff24598f3aa54c000b22
tree0cf75a06dfae9ba325facba4a45d739bc4ec5c85
parentcb1e002c07622e027e80a3843d27a623d1617430
remove merge=union attribute for Misc/NEWS (GH-460) (GH-988)

(cherry picked from commit 060d2d776a29341c079cce37220324f9775140ba)
.gitattributes