t / t5100 / msg0006on commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1Here is a patch from A U Thor.
   2