Merge branch 'jk/difftool-in-subdir'