t / t5100 / msg0016on commit merge-recursive: split out code for determining diff_filepairs (3f64687)
   1and some content
   2