RelNoteson commit Clarify kind of conflict in merge-one-file helper (adfd55d)
   1Documentation/RelNotes-1.6.3.txt