t / t4013 / diff.diff-tree_--pretty_--patch-with-stat_initialon commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1$ git diff-tree --pretty --patch-with-stat initial
   2$