Andrew's git / gitweb.git / templates/branches--
?
templates / branches--on commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1: this is just to ensure the directory exists.