Possible solution (stray 'my')
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs