Merge pull request #814 from myk002/myk_merge_union

set merge strategy to union for changelog
DFHack · Dec 9, 2024 · 0237f89 · 0237f89
2 parents 42614f4 + a220865
commit 0237f89
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+changelog.txt merge=union