RelNoteson commit Merge branch 'jc/conflict-marker-size' (3f3f8d9)
   1Documentation/RelNotes-1.7.1.txt