Merge branch 'se/doc-checkout-ours-theirs' into maint
[git] / RelNotes
1 Documentation/RelNotes/2.5.0.txt