From: Joey Hess Date: Mon, 24 May 2010 15:12:47 +0000 (-0400) Subject: use dpkg-mergechangelog X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/baeacba4762f92a24f888a0dab625e041e247184?ds=inline 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