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