t / t4013 / diff.diff-tree_masteron commit merge script: handle --no-ff --no-commit correctly (2a70fa4)
   1$ git diff-tree master
   2$