Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-10-19 09:53:18 +00:00
Code Issues Projects Releases Packages 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
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