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