From aa039aacf3f0e0442b0373719c80ff5e68fc794f Mon Sep 17 00:00:00 2001
From: Martin Kinkelin <kinke@users.noreply.github.com>
Date: Fri, 29 Apr 2022 01:46:52 +0200
Subject: [PATCH] Prevent constant CHANGELOG.md merge conflicts by using
 `union` merge driver (#3973)

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 607be26e275..37d841b1e00 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@
 
 .gitattributes export-ignore
 .travis.yml export-ignore
+CHANGELOG.md text merge=union