RelNoteson commit git-pull doc: fix grammo ("conflicts" is plural) (38ef8a7)
   1Documentation/RelNotes/1.8.1.5.txt