t / t5100 / msg0011on commit git-pull doc: fix grammo ("conflicts" is plural) (38ef8a7)
   1Here comes a commit log message, and
   2its second line is here.