Merge branch 'th/difftool-diffall'