ffmpeg/.gitattributes
Michael Niedermayer efdf7512a5
gitattributes: End merge conflicts in Changelog
Similar could be done with other lists that generally are appended to

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2025-03-17 15:26:10 +01:00

2 lines
43 B
Text

*.pnm -diff -text
Changelog merge=union