templates / branches--on commit blame: allow "blame file" in the middle of a conflicted merge (9aeaab6)
   1: this is just to ensure the directory exists.