Merge branch 'jc/conflict-marker-size' into next
[git/wpalmer.git] / RelNotes
blob00e77229ddadcb8a13b10b693a96bd76a4cb9f33
1 Documentation/RelNotes-1.7.1.txt