Merge branch 'jm/mergetool-submodules'
[git] / t / t5100 / patch0007