Documentation / technical / api-hash.txton commit Clarify kind of conflict in merge-one-file helper (adfd55d)
   1hash API
   2========
   3
   4Talk about <hash.h>
   5
   6(Linus)