t / t5100 / rfc2047-info-0008on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1Subject: (ab)
   2