1berry/FFmpeg
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gitattributes: End merge conflicts in Changelog

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2025-03-14 15:09:21 +01:00
parent 94beaf4872
commit efdf7512a5
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1 +1,2 @@
*.pnm -diff -text
Changelog merge=union