From: martin f. krafft <madduck@madduck.net>
Date: Mon, 30 Aug 2010 20:09:57 +0000 (+0200)
Subject: add mergechangelogs driver
X-Git-Url: https://git.madduck.net/etc/git.git/commitdiff_plain/a58ca949d53c406211bb6f19190a3eb66ba88b40?hp=0f97eee42bc7e8c372bfd4a81f40361b2de3e7fd

add mergechangelogs driver
---

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]