t / t5100 / rfc2047-info-0010on commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1Subject: (a b)
   2