templates / branches--on commit Use git-merge instead of git-resolve in git-pull. (f887564)
   1: this is just to ensure the directory exists.