templates / branches--on commit completion: --edit and --no-edit for git-merge (aad0709)
   1: this is just to ensure the directory exists.