Avoid merge conflicts in NEWS file

by using the `union` merge strategy.

See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.
Merge pull request #913 from krlmlr/gitattributes-NEWS

Avoid merge conflicts in NEWS file