[Pkg-owncloud-commits] [owncloud-client] 01/02: use dpkg-mergechangelogs for merging debian/changelog

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit ae979ddb2bfc9a2bda50f6b94dbdec9364b72e4f
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu Oct 10 11:12:53 2013 +0200

    use dpkg-mergechangelogs for merging debian/changelog
---
 .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/pkg-owncloud/owncloud-client.git