RelNoteson commit apply: --3way with add/add conflict (099f3c4)
   1Documentation/RelNotes/1.7.11.txt