Use merge=union strategy for all version changelogs (#21235)

lesteve · rth · web-flow · commit e15d94149a57 · 2021-10-05T18:59:04.000+02:00
Co-authored-by: Roman Yurchak &lt;rth.yurchak@gmail.com&gt;
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-/doc/whats_new.rst merge=union
+/doc/whats_new/v*.rst merge=union

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-/doc/whats_new.rst merge=union`
	`1`	`+/doc/whats_new/v*.rst merge=union`