t / t4013 / diff.diff-tree_masteron commit git-merge-recursive: learn to honor merge.conflictstyle (c236bcd)
   1$ git diff-tree master
   2$