Merge branch 'fc/mergetool-prompt'
[git] / t / t5100 / patch0008