[med-svn] [spades] 04/04: add mergechangelogs attrib

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

sascha-guest pushed a commit to branch ubuntu/trusty-backports
in repository spades.

commit ca688faceae45261b72405e227621f1723162fb7
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Tue Mar 22 09:47:28 2016 +0000

    add mergechangelogs attrib
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/spades.git