RelNoteson commit git notes merge: Handle real, non-conflicting notes merges (2085b16)
   1Documentation/RelNotes-1.7.2.1.txt