set merge strategy to union for changelog

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