t / t4013 / diff.diff-tree_-p_masteron commit rebase: implement --merge via the interactive machinery (68aa495)
   1$ git diff-tree -p master
   2$