t / t4013 / diff.diff-tree_initialon commit git-add: no need for -f when resolving a conflict in already tracked path (6e4f981)
   1$ git diff-tree initial
   2$