t / t5100 / msg0009on commit t6042: add tests for consistency in file collision conflict handling (bb05c9f)
   1This is to fix diff-format documentation.
   2