Merge branch 'th/difftool-diffall'
[git] / t / t5100 / patch0007