t / t4013 / diff.diff-tree_-p_masteron commit rerere forget path: forget recorded resolution (dea4562)
   1$ git diff-tree -p master
   2$