RelNoteson commit git-merge: minor fix for no_trivial_merge_strategies. (de6f0de)
   1Documentation/RelNotes-1.5.0.txt