RelNoteson commit Merge branch 'jc/conflict-marker-size' into maint (daaf2e8)
   1Documentation/RelNotes-1.7.0.4.txt