Andrew's git / gitweb.git / templates/branches--
?
templates / branches--on commit Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge() (4c4caaf)
   1: this is just to ensure the directory exists.