templates / branches--on commit merge-recursive: switch from (oid,mode) pairs to a diff_filespec (8daec1d)
   1: this is just to ensure the directory exists.