Merge branch 'da/mergetool-docs'
[git] / t / t5100 / patch0008