templates / this--descriptionon commit merge-recursive: switch from (oid,mode) pairs to a diff_filespec (8daec1d)
   1Unnamed repository; edit this file 'description' to name the repository.