t / t5100 / rfc2047-info-0011on commit git-pull doc: fix grammo ("conflicts" is plural) (38ef8a7)
   1Subject: (a b)
   2