From 87f4187d0ac62e72296231f99e8a78b009b0f3b6 Mon Sep 17 00:00:00 2001
From: Modestas Vainius <modestas@vainius.eu>
Date: Fri, 28 May 2010 17:30:07 +0300
Subject: [PATCH] Use dpkg-mergechangelogs.

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

diff --git a/.gitattributes b/.gitattributes
index 878221f9b..7d6d029fa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,3 +12,5 @@ configure        crlf=input
 *.dsw           -crlf
 *.sln           -crlf
 *.vcproj        -crlf
+
+debian/changelog merge=dpkg-mergechangelogs