Add new test to ensure git-merge handles pull.twohead and pull.octopus