Merge branch 'da/difftool-dir-diff-symlink-fix' into maint