templates / branches--on commit Fall back to three-way merge when applying a patch. (47f0b6d)
   1: this is just to ensure the directory exists.