templates / branches--on commit unpack-trees: do not check for conflict entries too early (711f151)
   1: this is just to ensure the directory exists.