somehow this fixed itself. go figure.
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs