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