t / t5100 / msg0007on commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1Here is an empty patch from A U Thor.
   2