* [FFmpeg-devel] [PATCH] gitattributes: End merge conflicts in Changelog
@ 2025-03-14 14:30 Michael Niedermayer
0 siblings, 0 replies; only message in thread
From: Michael Niedermayer @ 2025-03-14 14:30 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Similar could be done with other lists that generally are appended to
Signed-off-by: Michael Niedermayer <michael@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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-03-14 14:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-14 14:30 [FFmpeg-devel] [PATCH] gitattributes: End merge conflicts in Changelog Michael Niedermayer
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git