use better merge algorithm for CHANGELOG.md

see also: https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
tbu- · Sep 4, 2017 · 6182625 · 6182625
1 parent 413fcab
commit 6182625
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/CHANGELOG.md merge=union