merge-recursive: Fix multiple file rename across D/F conflict
[git] / t / t5100 / msg0016
1 and some content
2