RelNoteson commit Merge branch 'se/doc-checkout-ours-theirs' into maint (204ea3c)
   1Documentation/RelNotes/2.5.0.txt