Merge pull request #5091 from myk002/myk_union_attributes

myk002 · web-flow · commit 161e9499af95 · 2024-12-08T16:58:35.000-08:00
set the union merge strategy for the changelog
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+docs/changelog.txt merge=union
