both are now fixed in my po branch.
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs