t / t4013 / diff.diff-tree_-r_--abbrev=4_initialon commit t6038 (merge.renormalize): try checkout -m and cherry-pick (d347cee)
   1$ git diff-tree -r --abbrev=4 initial
   2$