t / t5100 / rfc2047-info-0001on commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1Author: Keith Moore
   2Email: moore@cs.utk.edu
   3Subject: If you can read this you understand the example.
   4