Standardize layout of blame sample
Reorganize and doc-commentify blame sample.
Fix warnings
blame sample: usage comment
merge writes workdir contents using index checkout (with conflicts)