Try normalizing files to avoid delete/modify conflicts when merging
[gitweb.git] / Documentation / technical / api-diff.txt
2007-12-18 Merge branch 'maint'
2007-12-15 Start preparing the API documents.