From cf7eca64e222f7df64f198b88d2d5ddb7684c793 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@debian.org>
Date: Thu, 27 May 2010 11:27:14 +0200
Subject: enable automatic changelog merging

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..5d425843
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs
-- 
cgit v1.2.3