merge-recursive: apply necessary modifications for directory renames
[git] / t / t5100 / msg0016
1 and some content
2