t / t5100 / msg0006on commit git-pull doc: fix grammo ("conflicts" is plural) (38ef8a7)
   1Here is a patch from A U Thor.
   2