merge-recursive: Fix multiple file rename across D/F conflict
[git] / t / t5100 / msg0015
1   - a list
2   - of stuff