merge-one-file: fix broken merges with alternate work trees
[git] / t / t5100 / msg0016
1 and some content
2