projects / git.ikiwiki.info.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
Merge tag '3.20120202' into trail3-integrated
[git.ikiwiki.info.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs
Unnamed repository; edit this file 'description' to name the repository.