[FFmpeg-cvslog] gitattributes: End merge conflicts in Changelog

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Mar 14 15:09:21 2025 +0100| [efdf7512a584f87ff98fcce3449deffd9abae093] | committer: Michael Niedermayer

gitattributes: End merge conflicts in Changelog

Similar could be done with other lists that generally are appended to

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efdf7512a584f87ff98fcce3449deffd9abae093
---

 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index a900528e47..b64bbed2eb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 *.pnm -diff -text
+Changelog    merge=union