t / t5100 / rfc2047-info-0002on commit merge-recursive: check for file level conflicts then get new name (f6f7755)
   1Author: Olle Järnefors
   2Email: ojarnef@admin.kth.se
   3Subject: Time for ISO 10646?
   4