templates / branches--on commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
   1: this is just to ensure the directory exists.