RelNoteson commit git-merge: add support for branch.<name>.mergeoptions (aec7b36)
   1Documentation/RelNotes-1.5.4.txt