t / t5100 / rfc2047-info-0002on commit git-pull doc: fix grammo ("conflicts" is plural) (38ef8a7)
   1Author: Olle Järnefors
   2Email: ojarnef@admin.kth.se
   3Subject: Time for ISO 10646?
   4