Merge branch 'da/difftool-dir-diff-fix'