t / t4013 / diff.diff-tree_-p_masteron commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1$ git diff-tree -p master
   2$