templates / branches--on commit Add new test to ensure git-merge handles pull.twohead and pull.octopus (b2eabcc)
   1: this is just to ensure the directory exists.