RelNoteson commit diff-files: document --ours etc. (47242cd)
   1Documentation/RelNotes/2.12.3.txt