RelNoteson commit Merge branch 'ah/diff-files-ours-theirs-doc' (7203baf)
   1Documentation/RelNotes/2.13.0.txt