Merge branch 'jc/conflict-marker-size'
[git] / RelNotes
1 Documentation/RelNotes-1.7.0.txt