Andrew's git / gitweb.git / templates/remotes--
?
templates / remotes--on commit diff-files -c/--cc: combine only when both ours and theirs exist. (939aabb)
   1: this is just to ensure the directory exists.