Merge branch 'jk/difftool-in-subdir'
[git] / t / t5100 / patch0008