]> granicus.if.org Git - python/commit
projects / python / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6abaed0) | patch
remove merge=union attribute for Misc/NEWS (GH-460)
authorINADA Naoki <methane@users.noreply.github.com>
Sat, 4 Mar 2017 23:49:45 +0000 (08:49 +0900)
committerGitHub <noreply@github.com>
Sat, 4 Mar 2017 23:49:45 +0000 (08:49 +0900)
commit060d2d776a29341c079cce37220324f9775140ba
treefe5bd1de096ab4e98704b55c342d9f7550c24a13tree | snapshot
parent6abaed0ddaa1dd9be727ede09f6cd801c467c2eccommit | diff
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)
.gitattributes diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.