t / t5100 / rfc2047-info-0011on commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Subject: (a b)
   2