RelNoteson commit merge-file: add option to select union merge favor (3a15048)
   1Documentation/RelNotes-1.7.0.txt