t / t4013 / diff.diff-tree_masteron commit rerere: add documentation for conflict normalization (fb90dca)
   1$ git diff-tree master
   2$