Added a comment: figured it out
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs