RelNoteson commit Merge branch 'jk/add-p-skip-conflicts' (3c52400)
   1Documentation/RelNotes/1.7.11.txt