set the union merge strategy for the changelog

DFHack · Dec 9, 2024 · 6b578c6 · 6b578c6
1 parent 9eb2a6a
commit 6b578c6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+docs/changelog.txt merge=union