t / t5100 / rfc2047-info-0005on commit blame: allow "blame file" in the middle of a conflicted merge (9aeaab6)
   1Subject: (a)
   2