t / t5100 / msg0009on commit Clarify kind of conflict in merge-one-file helper (adfd55d)
   1This is to fix diff-format documentation.
   2