From a58ca949d53c406211bb6f19190a3eb66ba88b40 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Mon, 30 Aug 2010 22:09:57 +0200
Subject: [PATCH] add mergechangelogs driver

---
 .gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 00ab0c7..c15fdd8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,6 +23,9 @@
 	autosetuprebase = remote
 [merge]
 	tool = vimdiff
+[merge "dpkg-mergechangelogs"]
+	name = debian/changelog merge driver
+	driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
 	tool = vimdiff
 [gui]
-- 
2.39.5