RelNoteson commit git-am: propagate --3way options as well (22db240)
   1Documentation/RelNotes-1.6.1.txt