Make changelog easier to merge

asiloisad · May 16, 2023 · 0cf5571 · 0cf5571
1 parent c803c6c
commit 0cf5571
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,5 @@
+CHANGELOG.* merge=union
+
 # Specs depend on character counts, if we don't specify the line endings the
 # fixtures will vary depending on platform
 spec/fixtures/**/*.js text eol=lf