Merge pull request #5322 from IntersectMBO/nm/changelog-merge-driver

lehins · web-flow · commit 3d2ad3a89606 · 2025-09-30T19:50:52.000-06:00
Revert "Use the "union" merge driver for changelogs"
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +0,0 @@
-# In changelogs, take lines from both versions, instead of leaving conflict markers
-CHANGELOG.md merge=union

Original file line number	Diff line number	Diff line change
`@@ -1,2 +0,0 @@`
`1`		`-# In changelogs, take lines from both versions, instead of leaving conflict markers`
`2`		`-CHANGELOG.md merge=union`