Merge branch 'jg/mergetool'
[git] / t / t5100 / patch0007