Configure merge=union for changelog.txt to reduce merge conflicts#381
Merged
myk002 merged 1 commit intoDFHack:masterfrom TymurGubayev:patch-5Dec 9, 2024
+1
merge=union for changelog.txt to reduce merge conflicts#381