t / t4013 / diff.diff-tree_-p_initialon commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1$ git diff-tree -p initial
   2$