t / t3900 / 1-UTF-8.txton commit merge-recursive: switch from (oid,mode) pairs to a diff_filespec (8daec1d)
   1ÄËÑÏÖ
   2
   3Ábçdèfg