t / t5100 / msg0009on commit git-pull doc: fix grammo ("conflicts" is plural) (38ef8a7)
   1This is to fix diff-format documentation.
   2