RelNoteson commit git-merge-file --ours, --theirs (73eb40e)
   1Documentation/RelNotes-1.6.6.txt