Andrew's git / gitweb.git / templates/branches--
?
templates / branches--on commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1: this is just to ensure the directory exists.