RelNoteson commit Add a new test for using a custom merge strategy (1b1d78f)
   1Documentation/RelNotes-1.6.0.txt