Merge branch 'se/doc-checkout-ours-theirs' into maint
[git] / t / t5100 / msg0007
1 Here is an empty patch from A U Thor.
2