Reduce conflict on Misc/NEWS (GH-212)
use "union" merge strategy for Misc/NEWS.
I
INADA Naoki committed
3f3d0364a91aa8b89e175a49f93ad04dd4676186
Parent: 32e8f9b
Committed by GitHub <noreply@github.com>
on 2/21/2017, 9:17:06 AM