merge-one-file: fix broken merges with alternate work trees
[git] / t / t5100 / msg0001
1 Here is a patch from A U Thor.
2