templates / branches--on commit [PATCH] Make sure git-resolve-script always works on commits (02a4a32)
   1: this is just to ensure the directory exists.