RelNoteson commit builtin-merge: give a proper error message for invalid strategies in config (1719b5e)
   1Documentation/RelNotes-1.6.0.txt