summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorINADA Naoki <methane@users.noreply.github.com>2017-02-21 18:39:41 +0900
committerGitHub <noreply@github.com>2017-02-21 18:39:41 +0900
commit2c700af5a761f83f303cc7295b660ac31f7d4ed1 (patch)
treee5dbd0990f629a3c4c5e7341816a38eac78f3ad7 /.gitattributes
parent3f3d0364a91aa8b89e175a49f93ad04dd4676186 (diff)
downloadcpython-git-2c700af5a761f83f303cc7295b660ac31f7d4ed1.tar.gz
.gitattribute -> .gitattributes (GH-213)
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..253cc6dee4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+Misc/NEWS merge=union