t / t5100 / rfc2047-info-0005on commit rebase: show consistent conflict resolution hint (89c7ae9)
   1Subject: (a)
   2