projects / ikiwiki.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
Merge branch 'revert'
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.