Similar could be done with other lists that generally are appended to Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> --- .gitattributes | 1 + 1 file changed, 1 insertion(+)
diff --git a/.gitattributes b/.gitattributes index a900528e474..b64bbed2eb4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ *.pnm -diff -text +Changelog merge=union -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
