t / t5100 / rfc2047-info-0005on commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1Subject: (a)
   2