From a2208650e0d0e3bc19db2d44ed0fe8f6c662af66 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sun, 8 Dec 2024 16:53:42 -0800
Subject: [PATCH] set merge strategy to union for changelog

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

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