summaryrefslogtreecommitdiffstats
path: root/debian/local/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'debian/local/gitconfig')
-rw-r--r--debian/local/gitconfig5
1 files changed, 5 insertions, 0 deletions
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