t / t5100 / msg0009on commit Merge branch 'jk/add-p-skip-conflicts' into maint (4579a05)
   1This is to fix diff-format documentation.
   2