t / t5100 / emptyon commit git-pull doc: fix grammo ("conflicts" is plural) (38ef8a7)
   1