t / t4013 / diff.diff-tree_-p_initialon commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1$ git diff-tree -p initial
   2$