Merge branch 'jk/difftool-command-not-found'