Merge branch 'da/difftool-mergetool-simplify-reporting-status'