t / t5100 / rfc2047-info-0002on commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1Author: Olle Järnefors
   2Email: ojarnef@admin.kth.se
   3Subject: Time for ISO 10646?
   4