Merge branch 'jk/difftool-dir-diff-edit-fix'