RelNoteson commit Add new test to ensure git-merge handles pull.twohead and pull.octopus (b2eabcc)
   1Documentation/RelNotes-1.6.0.txt