From 0cf55710067271c501ee8cb2b8d12fa976680f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Szabo?= <mauricio.szabo@gmail.com>
Date: Tue, 16 May 2023 10:51:48 -0300
Subject: [PATCH] Make changelog easier to merge

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 4505149dad..45b828d634 100644
--- 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