[Pkg-wmaker-commits] [wmbattery] 115/241: use dpkg-mergechangelog

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch master
in repository wmbattery.

commit 26f15bd133dc3a24d8c016173198f1d026d98c1d
Author: Joey Hess <joey at kitenet.net>
Date:   Mon May 24 11:12:48 2010 -0400

    use dpkg-mergechangelog
---
 .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-wmaker/wmbattery.git