templates / branches--on commit rerere: teach rerere to handle nested conflicts (4af3220)
   1: this is just to ensure the directory exists.