Documentation / technical / api-decorate.txton commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1decorate API
   2============
   3
   4Talk about <decorate.h>
   5
   6(Linus)