t / t5100 / rfc2047-info-0006on commit git notes merge: Manual conflict resolution, part 2/2 (6abb365)
   1Subject: (a b)
   2