templates / branches--on commit git.el: Use git-add-file for unmerged files, remove git-resolve-file (aaa68dd)
   1: this is just to ensure the directory exists.