Union merging for CHANGES.txt

https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/ Signed-off-by: Chris Warrick <[email protected]>
getnikola · Apr 15, 2018 · 54cd963 · 54cd963
1 parent df80757
commit 54cd963
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.txt merge=union