t / t5100 / msg0009on commit merge-recursive: Fix D/F conflicts (3734893)
   1This is to fix diff-format documentation.
   2