Merge pull request #381 from TymurGubayev/patch-5

Configure `merge=union` for `changelog.txt` to reduce merge conflicts
DFHack · Dec 9, 2024 · ed3a7a7 · ed3a7a7
2 parents 35a5e01 + 9a893d6
commit ed3a7a7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+changelog.txt merge=union