[FFmpeg-devel] [PATCH] gitattributes: End merge conflicts in Changelog
Michael Niedermayer
michael at niedermayer.cc
Fri Mar 14 16:30:46 EET 2025
Similar could be done with other lists that generally are appended to
Signed-off-by: Michael Niedermayer <michael at 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
More information about the ffmpeg-devel
mailing list