t / t4013 / diff.diff-tree_masteron commit Aggressive three-way merge: fix D/F case (cee2d6a)
   1$ git diff-tree master
   2$