Merge branch 'rh/merge-options-doc-fix'
[git] / t / t5100 / patch0007