| commit | 060d2d776a29341c079cce37220324f9775140ba | [log] [tgz] |
|---|---|---|
| author | INADA Naoki <methane@users.noreply.github.com> | Sun Mar 05 08:49:45 2017 +0900 |
| committer | GitHub <noreply@github.com> | Sun Mar 05 08:49:45 2017 +0900 |
| tree | fe5bd1de096ab4e98704b55c342d9f7550c24a13 | |
| parent | 6abaed0ddaa1dd9be727ede09f6cd801c467c2ec [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)