Merge branch 'da/mergetool-delete-delete-conflict' into maint
[git] / RelNotes
1 Documentation/RelNotes/2.8.1.txt