Documentation / technical / api-decorate.txton commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1decorate API
   2============
   3
   4Talk about <decorate.h>
   5
   6(Linus)