Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs