diff options
| author | INADA Naoki <methane@users.noreply.github.com> | 2017-03-05 08:49:45 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 08:49:45 +0900 |
| commit | 060d2d776a29341c079cce37220324f9775140ba (patch) | |
| tree | fe5bd1de096ab4e98704b55c342d9f7550c24a13 /.gitattributes | |
| parent | 6abaed0ddaa1dd9be727ede09f6cd801c467c2ec (diff) | |
| download | cpython-git-060d2d776a29341c079cce37220324f9775140ba.tar.gz | |
remove merge=union attribute for Misc/NEWS (GH-460)
Github doesn't support it (ref. isaacs/github#487). So it can't ease
conflict on Github.
Additionally, it can make trouble when cherry-pick. (ref. GH-212)
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 55a3f49922..82694d81f2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,3 @@ -Misc/NEWS merge=union - *.pck binary Lib/test/cjkencodings/* binary Lib/test/decimaltestdata/*.decTest binary |