t / t5100 / msg0009on commit Merge branch 'jc/maint-add-u-remove-conflicted' (f39e4cf)
   1This is to fix diff-format documentation.
   2