From ec7d37955709054f482a77996d790aa881c2b9fc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:49:04 +0200 Subject: Adding dpkg-mergechangelogs merge driver for debian/changelog files. Signed-off-by: Daniel Baumann --- debian/local/gitconfig | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian/local/gitconfig') diff --git a/debian/local/gitconfig b/debian/local/gitconfig index a48fcf4..a62573f 100644 --- a/debian/local/gitconfig +++ b/debian/local/gitconfig @@ -22,3 +22,8 @@ [log] follow = true + +[merge "dpkg-mergechangelogs"] + # depends: dpkg-dev + name = debian/changelog merge driver + driver = dpkg-mergechangelogs -m %O %A %B %A -- cgit v1.2.3