From efdf7512a584f87ff98fcce3449deffd9abae093 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 14 Mar 2025 15:09:21 +0100
Subject: [PATCH] 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>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index a900528e47..b64bbed2eb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 *.pnm -diff -text
+Changelog    merge=union