branch ready for merge, I think
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs