RelNoteson commit git-merge-ours: make it a builtin. (a00a42a)
   1Documentation/RelNotes-1.5.4.txt