new patch for this, still not fixed in ikiwiki, but at least a more reasonable patch now
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs