t / t5100 / rfc2047-info-0002on commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Author: Olle Järnefors
   2Email: ojarnef@admin.kth.se
   3Subject: Time for ISO 10646?
   4