RelNoteson commit Add a second testcase for handling invalid strategies in git-merge (dce61e7)
   1Documentation/RelNotes-1.6.0.txt