Documentation / technical / api-decorate.txton commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1decorate API
   2============
   3
   4Talk about <decorate.h>
   5
   6(Linus)