]> err.no Git - moreutils/commitdiff
use dpkg-mergechangelog
authorJoey Hess <joey@kitenet.net>
Mon, 24 May 2010 15:12:47 +0000 (11:12 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 24 May 2010 15:12:47 +0000 (11:12 -0400)
.gitattributes [new file with mode: 0644]

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..5d42584
--- /dev/null
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs