t / t5100 / msg0009on commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1This is to fix diff-format documentation.
   2