Merge branch 'rt/doc-merge-file-diff3'
[git] / t / t5100 / msg0001
1 Here is a patch from A U Thor.
2