enable dpkg-mergechangelogs

This commit is contained in:
Joey Hess 2011-01-09 15:12:52 -04:00
parent fd3efc086a
commit 9de1192c57

2
.gitattributes vendored
View file

@ -1 +1 @@
.git-annex/*.log merge=union
debian/changelog merge=dpkg-mergechangelogs