t / t5100 / msg0016on commit merge-recursive: switch from (oid,mode) pairs to a diff_filespec (8daec1d)
   1and some content
   2