merge-recursive: split out code for determining diff_filepairs
[git] / t / t5100 / msg0016
1 and some content
2