Added a comment: kind of solved, but another problem comes up
[git.ikiwiki.info.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs