From 9de1192c574dc304f3e9dbfd01296f74c7ea5969 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 9 Jan 2011 15:12:52 -0400
Subject: enable dpkg-mergechangelogs

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index b98b07d7d..5d425843f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-.git-annex/*.log merge=union
+debian/changelog merge=dpkg-mergechangelogs
-- 
cgit v1.2.3