Use dpkg-mergechangelogs.

15 years ago · 87f4187d0a
parent c18e37da85
commit 87f4187d0a
1 changed files with 2 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -12,3 +12,5 @@ configure        crlf=input
 *.dsw           -crlf
 *.sln           -crlf
 *.vcproj        -crlf
+
+debian/changelog merge=dpkg-mergechangelogs