Documentation / technical / api-decorate.txton commit git.el: Use git-add-file for unmerged files, remove git-resolve-file (aaa68dd)
   1decorate API
   2============
   3
   4Talk about <decorate.h>
   5
   6(Linus)