RelNoteson commit Merge branch 'jc/conflict-marker-size' (06dbc1e)
   1Documentation/RelNotes-1.7.0.txt