done, PEBKAC. Thank you for your time :)
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs