| commit | 3f3d0364a91aa8b89e175a49f93ad04dd4676186 | [log] [tgz] |
|---|---|---|
| author | INADA Naoki <methane@users.noreply.github.com> | Tue Feb 21 18:17:06 2017 +0900 |
| committer | GitHub <noreply@github.com> | Tue Feb 21 18:17:06 2017 +0900 |
| tree | b89de30c4f2fa237fbedf5d07e127778e701ce6d | |
| parent | 32e8f9bdfd4324f1aa4fbbdf1ed8536f2b00cabb [diff] |
Reduce conflict on Misc/NEWS (GH-212) use "union" merge strategy for Misc/NEWS.