RelNoteson commit merge-strategies: avoid implying that "-s theirs" exists (c25d98b)
   1Documentation/RelNotes/2.10.4.txt