Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
[git.git] / RelNotes
1 Documentation/RelNotes/1.7.11.6.txt