t / t5100 / msg0009on commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1This is to fix diff-format documentation.
   2