t / t5100 / msg0009on commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1This is to fix diff-format documentation.
   2