t / t4013 / diff.diff-tree_-p_initialon commit merge script: handle --no-ff --no-commit correctly (2a70fa4)
   1$ git diff-tree -p initial
   2$