sigh, still broken, different error message.
[git.ikiwiki.info.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs