old and new cvs goodies needing merging
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs