From 9a893d6f1329cffd949122cec040fc832c055ad7 Mon Sep 17 00:00:00 2001
From: Timur Kelman <tymur.gubayev@gmail.com>
Date: Mon, 9 May 2022 18:53:26 +0200
Subject: [PATCH] Configure `merge=union` for `changelog.txt` to reduce merge
 conflicts

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..8b077fbd74
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+changelog.txt merge=union