Add custom merge strategy for CHANGELOG.md

The merge strategy `union` should hopefully reduce the number of
conflicts when trying to rebase the configuration file, since most of
the changes are simple additions anyways.

Author: chrisduerr

Diff for: .gitattributes

@@ -0,0 +1 @@
+/CHANGELOG.md merge=union