Re: [FFmpeg-devel] [PATCH] gitattributes: End merge conflicts in Changelog

2025-03-16 Thread Michael Niedermayer
On Fri, Mar 14, 2025 at 03:30:46PM +0100, Michael Niedermayer wrote: > Similar could be done with other lists that generally are appended to > > Signed-off-by: Michael Niedermayer > --- > .gitattributes | 1 + > 1 file changed, 1 insertion(+) will apply [...] -- Michael GnuPG fingerprint

[FFmpeg-devel] [PATCH] gitattributes: End merge conflicts in Changelog

2025-03-14 Thread Michael Niedermayer
Similar could be done with other lists that generally are appended to Signed-off-by: Michael Niedermayer --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index a900528e474..b64bbed2eb4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1