t / t4013 / diff.diff-tree_-p_masteron commit Merge branch 'nd/remote-plural-ours-plus-theirs' (7a7d085)
   1$ git diff-tree -p master
   2$