From: Joey Hess <joey@kitenet.net>
Date: Mon, 24 May 2010 15:12:35 +0000 (-0400)
Subject: use dpkg-mergechangelog
X-Git-Tag: 7.9.1~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c5693eb872c10beb7f2abf5086b79dc0095ab750;p=debhelper.git

use dpkg-mergechangelog
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs