From: Joey Hess Date: Mon, 24 May 2010 15:12:36 +0000 (-0400) Subject: use dpkg-mergechangelog X-Git-Tag: 2.48~2 X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=8896a03e45d4d5b8ca86773ba37a1039d25b8790;p=filters.git use dpkg-mergechangelog --- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5d42584 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs