RelNoteson commit merge: let custom strategies intervene in trivial merges (52b48ef)
   1Documentation/RelNotes-1.7.2.txt