From: Joey Hess <joey@kitenet.net>
Date: Fri, 25 Jun 2010 17:43:02 +0000 (-0400)
Subject: auto changelog merging
X-Git-Tag: 3.20100704~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7399f56607d789b2152b9461397b93b8db88ccff;p=ikiwiki.git

auto changelog merging
---

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